diff --git a/app/code/Magento/AdminNotification/i18n/zh_CN.csv b/app/code/Magento/AdminNotification/i18n/zh_CN.csv
index 33d0fd24b5b9..f1767f004842 100644
--- a/app/code/Magento/AdminNotification/i18n/zh_CN.csv
+++ b/app/code/Magento/AdminNotification/i18n/zh_CN.csv
@@ -11,7 +11,7 @@ Message,信息
 Notification,通知
 Notifications,通知
 "One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.",媒体存储同步过程中一个或更多文件未能同步，打开日志文件查看详细。
-"One or more of the Cache Types are invalidated: %1. ","一个或多个缓存类型是无效的: %1。 "
+"One or more of the Cache Types are invalidated: %1. ","一个或多个缓存类型是无效的： %1。 "
 "Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","请去<a href=""%1"">缓存管理</a>刷新缓存类型。"
 "Please select messages.",请选择一条信息。
 "Read Details",阅读详情
diff --git a/app/code/Magento/Adminhtml/i18n/zh_CN.csv b/app/code/Magento/Adminhtml/i18n/zh_CN.csv
index 6dc62ac7aa4f..a0f2f265d648 100644
--- a/app/code/Magento/Adminhtml/i18n/zh_CN.csv
+++ b/app/code/Magento/Adminhtml/i18n/zh_CN.csv
@@ -16,7 +16,7 @@
 24h,24h
 2YTD,2YTD
 "6 Hours",6小时
-"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this。target='blank'"">%2 %3</a> <a href=""mailto:%4"">（%4）</a>"
+"<a href=""%1"" onclick=""this.target='blank'"">%2 %3</a> <a href=""mailto:%4"">(%4)</a>","<a href=""%1"" onclick=""this。target='blank'"">%2 %3</a> <a href=""mailto：%4"">（%4）</a>"
 "<strong>Attention</strong>: Captcha is case sensitive.",<strong>注意</strong>：验证码为大小写敏感的。
 "A total of %1 record(s) were deleted.",共%1条记录被删除。
 "A total of %1 record(s) were updated.",共%1条记录被更新。
@@ -89,9 +89,9 @@ Any,任意
 "Apply the rule only if the following conditions are met (leave blank for all products).",仅仅符合下面的条件才应用该规则（对于所有产品留空）。
 "Are you sure that you want to delete this template?",您是否确认要删除该模板？
 "Are you sure that you want to strip tags?",您是否确认要取消标签？
-"Are you sure you want to continue?",您确定要继续吗?
-"Are you sure you want to delete this file?",您确定要删除该文件吗?
-"Are you sure you want to delete this folder?",您确定要删除该目录吗?
+"Are you sure you want to continue?",您确定要继续吗？
+"Are you sure you want to delete this file?",您确定要删除该文件吗？
+"Are you sure you want to delete this folder?",您确定要删除该目录吗？
 "Are you sure you want to do this?",您是否确认要这样做？
 "Are you sure you want to proceed?",你是否确定要继续？
 "As low as:",低至：
@@ -116,10 +116,10 @@ Bestsellers,最佳销量
 "Block Information",块信息
 Blocks,块
 "Both IPN and PDT",IPN和PDT
-"Browse Files...",浏览文件...
+"Browse Files...",浏览文件。。。
 "Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.",与动态价格的捆绑不能包含自定义的选项。选项将无法保存。
 CMS,CMS
-"CMS page:",CMS页:
+"CMS page:",CMS页：
 CSV,CSV
 "Cache Control",缓存控制
 "Cache Management",缓存管理
@@ -194,7 +194,7 @@ Customers,客户
 "Customers Now Online",当前在线客户
 "Customers by Number of Orders",按订单数统计的客户
 "Customers by Orders Total",按订单数量排列顾客
-"Customers that have wish list: %1%","有收藏清单的客户: %1%"
+"Customers that have wish list: %1%","有收藏清单的客户： %1%"
 Dashboard,仪表板
 Database,数据库
 Date,日期
@@ -228,7 +228,7 @@ Download,下载
 Downloads,下载
 "Downloads Report",下载报表
 Edit,编辑
-"Edit Customer Group ""%1""","编辑客户组:""%1"""
+"Edit Customer Group ""%1""","编辑客户组：""%1"""
 "Edit Design Change",编辑设计变动
 "Edit Email Template",编辑邮件模板
 "Edit Order",编辑订单
@@ -303,7 +303,7 @@ ID,ID
 "IPN (Instant Payment Notification) Only",仅IPN（即时支付通知）
 "If there is an account associated with %1 you will receive an email with a link to reset your password.","如果有关联给 %1 的账户，你将收到一封包含重设密码链接的电子邮件。"
 "If you continue to receive this message, please contact the store owner.",如果您一直收到该消息，请联系店主。
-"Images (%1)",图片:（%1）
+"Images (%1)",图片：（%1）
 "Images (.gif, .jpg, .png)",图像（。gif、。jpg、。png）
 "Images Cache",图像缓存
 Import,导入
@@ -314,7 +314,7 @@ Import/Export,导入/导出
 Inactive,未激活
 "Incl. Tax",含税
 "Incoming Message",收到的信息
-"Insert Variable...",插入变量...
+"Insert Variable...",插入变量。。。
 "Interface Locale",接口本地化
 Interval,周期
 "Invalid Form Key. Please refresh the page.",来源密钥无效，请刷新本页面。
@@ -351,7 +351,7 @@ Links,链接
 "List Only",仅列表
 "Load Template",加载模板
 "Load default template",加载默认模板
-Loading...,正在加载...
+Loading...,正在加载。。。
 Locale,区域
 "Log Out",注销
 "Log into Magento Admin Page",登录到Magento管理页面
@@ -438,11 +438,11 @@ None,无
 Note:,注意：
 Notes,注意
 Notifications,通知
-"Number of items bought from a wish list: %1","从收藏清单里购买的数量: %1"
-"Number of times wish lists have been shared (emailed): %1","收藏清单里分享的次数（发邮件的）: %1"
-"Number of wish list conversions: %1","收藏清单转化数量: %1"
-"Number of wish list referrals: %1","收藏清单导入的数量: %1"
-"Number of wish lists: %1","收藏的数量: %1"
+"Number of items bought from a wish list: %1","从收藏清单里购买的数量： %1"
+"Number of times wish lists have been shared (emailed): %1","收藏清单里分享的次数（发邮件的）： %1"
+"Number of wish list conversions: %1","收藏清单转化数量： %1"
+"Number of wish list referrals: %1","收藏清单导入的数量： %1"
+"Number of wish lists: %1","收藏的数量： %1"
 OK,确定
 "Offline Refunds",离线的退款
 "Old rate:",原本的比例：
@@ -485,20 +485,20 @@ Permissions,权限
 "Please enter 6 or more characters.","请输入 6 个或更多个字符。"
 "Please enter a number greater than 0 in this field.",请在该字段中输入大于0的数字。
 "Please enter a password.",请输入密码。
-"Please enter a valid URL (for example, the URL must begin with ""http://"").","请输入有效的URL（例如:URL必须以""http://""开头）。"
-"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","请输入有效的URL（例如:http://www。example。com or www。example。com）。"
+"Please enter a valid URL (for example, the URL must begin with ""http://"").","请输入有效的URL（例如：URL必须以""http：//""开头）。"
+"Please enter a valid URL (for examples, http://www.example.com or www.example.com).","请输入有效的URL（例如：http：//www。example。com or www。example。com）。"
 "Please enter a valid credit card number.",请输入有效的信用卡卡号。
 "Please enter a valid date.",请输入有效日期
-"Please enter a valid dollar amount (for example, $100.00).",请输入有效的美元数量（如:$100。00）。
-"Please enter a valid email address(for example johndoe@domain.com.).",请输入有效的邮件地址（例如:jondoe@domain。com）。
+"Please enter a valid dollar amount (for example, $100.00).",请输入有效的美元数量（如：$100。00）。
+"Please enter a valid email address(for example johndoe@domain.com.).",请输入有效的邮件地址（例如：jondoe@domain。com）。
 "Please enter a valid email address. For example johndoe@domain.com.",请输入有效邮件地址。例如johndoe@domain。com。
 "Please enter a valid email.",请输入有效邮件。
 "Please enter a valid number in this field.",请在此区域输入有效的数字。
 "Please enter a valid password.",请输入有效的密码。
-"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","请输入有效的电话号码（例如:（123） 456-7890 或者 123-456-7890）。"
-"Please enter a valid social security number (for example, 123-45-6789).",请输入有效的社会保险号（例如:123-45-6789）。
+"Please enter a valid phone number (for example, (123) 456-7890 or 123-456-7890).","请输入有效的电话号码（例如：（123） 456-7890 或者 123-456-7890）。"
+"Please enter a valid social security number (for example, 123-45-6789).",请输入有效的社会保险号（例如：123-45-6789）。
 "Please enter a valid social security number. For example 123-45-6789.",请输入有效社会安全号码，例如123-45-6789。
-"Please enter a valid zip code (for example, 90602 or 90602-1234).","请输入有效的邮编 （例如:90602或90602-1234）。"
+"Please enter a valid zip code (for example, 90602 or 90602-1234).","请输入有效的邮编 （例如：90602或90602-1234）。"
 "Please enter a valid zip code.",请输入有效的邮政编码。
 "Please enter a valid zip code. For example 90602 or 90602-1234.",请输入有效邮编，例如90602或90602-1234。
 "Please enter new template name.",请输入新的模板名字。
@@ -530,10 +530,10 @@ Permissions,权限
 "Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.",请在该字段中只使用数字。请不要使用空格或其它字符，例如句点或逗号。
 "Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.",在此字段内请仅使用字母（az或AZ）、数字（0-9）或空格。
 "Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.",请使用这样的日期格式：dd/mm/yyyy。例如17/03/2006代表2006年3月17日。
-"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","请使用如下日期格式: dd/mm/yyyy。 例如: 输入""17/03/2006""表示March 17， 2006。"
+"Please use this date format: dd/mm/yyyy. For example, enter ""17/03/2006"" to represent March 17, 2006.","请使用如下日期格式： dd/mm/yyyy。 例如： 输入""17/03/2006""表示March 17， 2006。"
 "Please wait until the action ends.",请等待操作结束。
-"Please wait, loading...",请稍候，正在加载...
-"Please wait...",请稍候...
+"Please wait, loading...",请稍候，正在加载。。。
+"Please wait...",请稍候。。。
 "Position of Watermark for %1",%1的水印位置
 "Pregenerated product images files",预产生图片文件
 Preview,预览
@@ -685,7 +685,7 @@ Subtotal,小计
 "Switch/Solo/Maestro Only","仅限 Switch/Solo/Maestro"
 Synchronize,同步
 "Synchronizing %1 to %2",同步%1到%2
-Synchronizing...,正在同步...
+Synchronizing...,正在同步。。。
 System,系统
 "Target Path",目标路径
 Tax,传真
diff --git a/app/code/Magento/Authorizenet/i18n/zh_CN.csv b/app/code/Magento/Authorizenet/i18n/zh_CN.csv
index 3c6d884954e2..a5befb9bea5b 100644
--- a/app/code/Magento/Authorizenet/i18n/zh_CN.csv
+++ b/app/code/Magento/Authorizenet/i18n/zh_CN.csv
@@ -11,7 +11,7 @@ Enabled,已启用
 "New Order Status",新订单状态
 "Order saving error: %1",订单保存错误：%1
 "Please choose a payment method.",请选择支付方法。
-"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","发生错误: 付款额订单额不匹配，请纠正后再试。"
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","发生错误： 付款额订单额不匹配，请纠正后再试。"
 "Sort Order",排序顺序
 "The transaction was declined because the response hash validation failed.",因为响应哈希校验失败交易被拒绝。
 "There was a payment authorization error.",支付授权发生错误。
diff --git a/app/code/Magento/Backend/i18n/zh_CN.csv b/app/code/Magento/Backend/i18n/zh_CN.csv
index c6558fb43737..1c504093fa36 100644
--- a/app/code/Magento/Backend/i18n/zh_CN.csv
+++ b/app/code/Magento/Backend/i18n/zh_CN.csv
@@ -22,17 +22,17 @@ ImageMagick,ImageMagick
 "PHP GD2","PHP GD2"
 "Please confirm site switching. All data that hasn't been saved will be lost.",请确认站点转换。所有没有被存储的数据将会丢失。
 "Please correct the column format and try again.",请纠正列格式再试一次。
-"Please correct the email address: ""%1"".","请纠正邮件地址: ""%1""。"
+"Please correct the email address: ""%1"".","请纠正邮件地址： ""%1""。"
 "Please correct the tab configuration and try again.",请纠正tab配置再试一次。
 "Please correct the timezone.",请纠正您的时区。
 "Please correct the user name or password.",请纠正用户名或密码。
 "Search String",搜索字符串
 "Selected allowed currency ""%1"" is not available in installed currencies.","安装的货币中找不到您允许的货币""%1""。"
-"Service unavailable: %1","无效的服务: %1"
+"Service unavailable: %1","无效的服务： %1"
 "Sorry, the default display currency you selected in not available in allowed currencies.","很抱歉， 您选择的默认显示货币在允许的货币里无效。"
 "Sorry, we haven't installed the base currency you selected.",很抱歉，还没有安装你选择的基础货币。
 "Sorry, we haven't installed the default display currency you selected.","很抱歉， 还没有安装你选择默认显示货币。"
-"Specify a URL or path that starts with placeholder(s): %1.",指定一个以占位符%1开头的URL或路径:。
+"Specify a URL or path that starts with placeholder(s): %1.",指定一个以占位符%1开头的URL或路径：。
 "Specify a fully qualified URL.",指定完整的URL。
 "The file you're uploading exceeds the server size limit of %1 kilobytes.","您正在上传的文件超过了服务器文件尺寸限制%1 kb。"
 "The sender name ""%1"" is not valid. Please use only visible characters and spaces.","无效的发送者名字""%1""。 请仅仅使用可见的字符和空。"
diff --git a/app/code/Magento/Bundle/i18n/zh_CN.csv b/app/code/Magento/Bundle/i18n/zh_CN.csv
index de4b251c2ee7..8438b599e2cf 100644
--- a/app/code/Magento/Bundle/i18n/zh_CN.csv
+++ b/app/code/Magento/Bundle/i18n/zh_CN.csv
@@ -1,14 +1,18 @@
+"%1 x %2","%1 x %2"
 "* Required Fields",*必要字段
 "-- Select --","-- 选择 --"
 "Add New Option",添加新选项
 "Add Products to Option",添加产品到选项
 "As Low as",低至
 "As low as",低至
+Availability,有效性
 "Bundle Items",捆绑项
 "Buy %1 with %2 discount each",买%1，每个送折扣%2
-"Choose a selection...",选择一个选项...
+"Choose a selection...",选择一个选项。。。
 Close,关闭
 "Create New Option",创建新的选项
+"Customize %1",定制%1
+"Customize and Add to Cart",定制并添加到购物车
 Default,默认
 "Default Quantity",默认数量
 Dynamic,动态
@@ -17,6 +21,7 @@ Fixed,固定
 From,来自
 From:,来自：
 "Gift Message",礼品消息
+"Go back to product details",回产品详细页
 "Incl. Tax",含税
 "Input Type",输入类型
 Message:,信息：
@@ -49,9 +54,4 @@ Together,一起
 "Use Default Value",使用默认值
 "User Defined",用户定义的
 "We cannot add this item to your shopping cart.",不能添加该条目到购物车。
-"%1 x %2","%1 x %2"
-Availability,"有效性"
-"Customize %1","定制%1"
-"Customize and Add to Cart","定制并添加到购物车"
-"Go back to product details","回产品详细页"
-"Your Customization","您的定制"
+"Your Customization",您的定制
diff --git a/app/code/Magento/Captcha/i18n/zh_CN.csv b/app/code/Magento/Captcha/i18n/zh_CN.csv
index c4c78bb261fb..e054b2c8a687 100644
--- a/app/code/Magento/Captcha/i18n/zh_CN.csv
+++ b/app/code/Magento/Captcha/i18n/zh_CN.csv
@@ -4,6 +4,6 @@ Always,总是
 "Incorrect CAPTCHA",不正确的CAPTCHA
 "Incorrect CAPTCHA.",验证码有误。
 "Please enter the letters below",请输入下面的字母
-"Please enter the letters from the image:",请输入图片里的字母:
+"Please enter the letters from the image:",请输入图片里的字母：
+"Please type the letters below",请输入下面的字符
 "Reload captcha",刷新验证码
-"Please type the letters below","请输入下面的字符"
diff --git a/app/code/Magento/Catalog/i18n/zh_CN.csv b/app/code/Magento/Catalog/i18n/zh_CN.csv
index c2359cdd9be3..9b19caad3458 100644
--- a/app/code/Magento/Catalog/i18n/zh_CN.csv
+++ b/app/code/Magento/Catalog/i18n/zh_CN.csv
@@ -3,6 +3,7 @@
 "%1 RSS Feed",%1RSS种子
 "%1 and above","%1 及以上"
 "%1 incl tax",%1含税
+"%1 incl tax.",%1含税。
 "%1 x %2 px.","%1 x %2 px。"
 "(Copy data from: %1)",（从%1复制数据）
 "* Required Fields",*必要字段
@@ -61,8 +62,10 @@ Amount,数量
 "Apply To",应用给
 Approved,已批准
 "Are you sure you want to delete this category?",你确定要删除此类别？
-"Are you sure you want to remove all products from your comparison?",您确定要从您的比较里移除所有的产品吗?
-"Are you sure you want to remove this item from the compared products?",您确定要从比较产品里移除该条目吗?
+"Are you sure you want to remove all products from your comparison?",您确定要从您的比较里移除所有的产品吗？
+"Are you sure you want to remove this item from the compared products?",您确定要从比较产品里移除该条目吗？
+"Are you sure you would like to remove all products from your comparison?",您确定要从比较列表中移除所有的产品？
+"Are you sure you would like to remove this item from the compare products?",您确定要从比较产品中移除该条目？
 "Are you sure?",您是否确认？
 "As low as:",低至：
 Assign,、分配
@@ -112,7 +115,7 @@ Change,更改
 "Check items to add to the cart or",检查要加入购物车的内容
 Choose,选择
 "Choose Affected Attribute Set",选择受影响的属性集
-"Choose an Option...",选择选项...
+"Choose an Option...",选择选项。。。
 "Clear All",清除全部
 "Clear Price",清除价格
 "Click for price",单击获取价格
@@ -231,6 +234,7 @@ Integer,整数
 "Invalid image file type.",无效的图像文件类型。
 "Is Default",为默认值
 "Items %1 to %2 of %3 total","条目%1到%2 共%3个"
+"Items %1-%2 of %3",第%1-%2个，共%3个条目
 Label,标签
 "Last Name",姓氏
 "Last Notified",最新通知
@@ -255,6 +259,7 @@ List,列表
 "Media Image",媒体图片
 "Minimum Qty Allowed in Shopping Cart",购物车允许的最小数量
 "Minimum Qty for Item's Status to be Out of Stock",状态转变为缺货的条目的最小数量
+"More Choices:",更多选择：
 "More Views",更多视图
 Move,移动
 N/A,N/A
@@ -307,7 +312,7 @@ Pending,挂起
 "Please specify the product's required option(s).",请指定产品的必要选项。
 "Please specify the quantity of product(s).",请指定产品数量。
 "Please specify time required option(s).",请指定时间需要的选项。
-"Please wait...",请稍候...
+"Please wait...",请稍候。。。
 Position,位置
 "Position in Layered Navigation",在层次式导航中定位
 "Position of Watermark for %1",%1的水印位置
@@ -351,6 +356,7 @@ Redirect,重定向
 "Related Products",相关产品
 Remove,删除
 "Remove Image",移除图片
+"Remove Product",移除产品
 "Remove Product From Websites",从网站删除产品
 "Remove This Item",删除该内容
 "Reorganize EAV category structure to flat structure",重新识别EAV分类结构为平坦结构
@@ -378,6 +384,7 @@ Scope,范围
 Search,搜索
 "Search Information",搜索信息
 "Search Query",搜索查询
+"Search results for: '%1'",搜索结果：“%1”
 Searchable,可搜索
 "See price before order confirmation.",确认订单前显示价格。
 "Select Configurable Attributes",选择可配置的属性
@@ -441,7 +448,7 @@ Text,文字
 "The From Date value should be less than or equal to the To Date value.",开始日期应该小于等于结束如期。
 "The attribute model is not defined.",属性模型未定义。
 "The base directory to upload file is not specified.",文件上传的基本目录尚未指定。
-"The category must be an instance of \Magento\Catalog\Model\Category.","分类必须是\Magento\Catalog\Model\Category的实例."
+"The category must be an instance of \Magento\Catalog\Model\Category.","分类必须是\Magento\Catalog\Model\Category的实例。"
 "The configuration item instance in options group is incorrect.",选项组中配置条目实例是不正确的。
 "The configuration item option instance in options group is incorrect.",选项组中配置条目选项实例是不正确的。
 "The filter model name must be declared.",过滤器模型必须被声明。
@@ -482,7 +489,7 @@ Title,标题
 "To see product price, add this item to your cart. You can always remove it later.",要查看产品价格，请添加该条目到您的购物车。您总是可以稍后删除它。
 Top/Left,顶部/左侧
 Top/Right,顶部/右侧
-"Total incl. Tax: %1","含税总价: %1"
+"Total incl. Tax: %1","含税总价： %1"
 Type,类型
 "URL Rewrite Management",URL重写管理
 "Unable to save product",不能存储产品
@@ -537,7 +544,7 @@ Websites,网站
 Yes,是
 "You added product %1 to the comparison list.",您已经添加了产品%1比较列表。
 "You already have an identical search term query.",您已经有了一个同样的搜索名词查询。
-"You are about to delete all products in this set. Are you sure you want to delete this attribute set?",此操作将要删除该集合里的所有产品。你确定要删除该属性集吗?
+"You are about to delete all products in this set. Are you sure you want to delete this attribute set?",此操作将要删除该集合里的所有产品。你确定要删除该属性集吗？
 "You can't update your attribute.",不能更新您的属性。
 "You cannot remove system attributes from this set.",不能从该属性集移除系统属性。
 "You cleared the comparison list.",您清除了比较列表。
@@ -545,7 +552,8 @@ Yes,是
 "You deleted the search.",您已经删除了该搜索。
 "You duplicated the product.",您已复制了该产品。
 "You have no items to compare.",您没有可比较的条目。
-"You may also be interested in the following product(s):",您也可以感兴趣下面的产品:
+"You may also be interested in the following product(s)",你可能页感兴趣下列产品
+"You may also be interested in the following product(s):",您也可以感兴趣下面的产品：
 "You removed product %1 from the comparison list.",您已经从比较列表中移除了%1。
 "You saved the attribute set.",您已经存储了属性集。
 "You saved the category.",您已经存储该分类。
@@ -557,7 +565,7 @@ Yes,是
 and,和
 "begin typing to add value",开始输入来添加值
 each,每个
-"ex. http://domain.com","例如 http://domain。com"
+"ex. http://domain.com","例如 http：//domain。com"
 lbs,磅
 "per page",每页
 px.,像素
@@ -565,11 +573,3 @@ save,保存
 "select all",全选
 "start typing to search category",开始输入来搜索分类
 "unselect all",撤销全选
-"Search results for: '%1'",搜索结果：“%1”
- "%1 incl tax.","%1含税."
-"Are you sure you would like to remove all products from your comparison?","您确定要从比较列表中移除所有的产品？"
-"Are you sure you would like to remove this item from the compare products?","您确定要从比较产品中移除该条目？"
-"Items %1-%2 of %3","第%1-%2个，共%3个条目"
-"More Choices:","更多选择:"
-"Remove Product","移除产品"
-"You may also be interested in the following product(s)","你可能页感兴趣下列产品"
diff --git a/app/code/Magento/CatalogSearch/i18n/zh_CN.csv b/app/code/Magento/CatalogSearch/i18n/zh_CN.csv
index c0efde2c7a60..e3c778aa3b95 100644
--- a/app/code/Magento/CatalogSearch/i18n/zh_CN.csv
+++ b/app/code/Magento/CatalogSearch/i18n/zh_CN.csv
@@ -1,4 +1,5 @@
 "%1 and greater",%1或更多
+"<strong>%1 item(s)</strong> were found using the following search criteria",发现<strong>%1个条目</strong>使用下面的搜索条件
 "<strong>%1 item(s)</strong> were found using the following search criteria.",<strong>%1个条目</strong>被发现使用下面的搜索条件。
 All,全部
 "Attribute setting change related with Search Index. Please run <a href=""%1"">Rebuild Search Index</a> process.","属性设置改变与搜索索引相关。请运行<a href=""%1"">重建搜索索引</a>过程。"
@@ -11,6 +12,7 @@ List,列表
 "Minimum Search query length is %1","最小搜索查询长度为 %1"
 "Modify your search",修改您的搜索
 No,否
+"No items were found using the following search criteria.",找不到使用下列搜索条件的条目。
 "Please specify at least one search term.",请至少指定一个搜索词。
 "Please specify correct data.",请指定正确的日期。
 "Popular Search Terms",热门搜索词
@@ -20,7 +22,7 @@ Results,结果
 Search,搜索
 "Search Settings",搜索设置
 "Search Terms",搜索条件
-"Search entire store here...",在这里搜索整个商店...
+"Search entire store here...",在这里搜索整个商店。。。
 Search:,搜索：
 "Sorry, but the maximum word count is %1. We left out this part of your search: %2.","很抱歉，最大单词数为%1。 我们忽略掉了您搜索的""%2""部分。"
 "There are no search terms available.",没有可用的搜索词
@@ -29,5 +31,3 @@ Yes,是
 "Your search query can't be longer than %1, so we had to shorten your query.",您的搜索关键字不能长于%1。所以我们不得不截断它。
 "Your search returns no results.",您的搜索未找到结果。
 "up to %1","至多 %1"
-"<strong>%1 item(s)</strong> were found using the following search criteria","发现<strong>%1个条目</strong>使用下面的搜索条件"
-"No items were found using the following search criteria.","找不到使用下列搜索条件的条目。"
diff --git a/app/code/Magento/Centinel/i18n/zh_CN.csv b/app/code/Magento/Centinel/i18n/zh_CN.csv
index 30bf9808bc9e..6e06b74873bd 100644
--- a/app/code/Magento/Centinel/i18n/zh_CN.csv
+++ b/app/code/Magento/Centinel/i18n/zh_CN.csv
@@ -17,7 +17,7 @@ Failed,已失败
 "Please continue with placing order.",请继续下订单。
 "Please verify the card with the issuer bank before placing the order.",在下订单前，请与发卡行验证信用卡。
 "Please verify the card with the issuer bank:",请与发卡行验证信用卡：
-"Start/Reset Validation...",开始/重设验证...
+"Start/Reset Validation...",开始/重设验证。。。
 Successful,成功
 "Successful attempt",成功尝试
 "The card has failed verification with the issuer bank.",卡片与发卡行的验证失败。
@@ -26,7 +26,7 @@ Successful,成功
 "This card has failed validation and cannot be used.",信用卡验证失败，无法使用。
 "To ensure the security of your transactions",要确保您的交易安全
 "Unable to complete",无法完成
-"Unsupported currency code: %1.","不支持的货币代码: %1。"
+"Unsupported currency code: %1.","不支持的货币代码： %1。"
 "Validation failed.",验证失败。
 "Verification Failed",验证失败
 "Verification Successful",验证成功
diff --git a/app/code/Magento/Checkout/i18n/zh_CN.csv b/app/code/Magento/Checkout/i18n/zh_CN.csv
index bd02090e27fe..2fa9136a7e35 100644
--- a/app/code/Magento/Checkout/i18n/zh_CN.csv
+++ b/app/code/Magento/Checkout/i18n/zh_CN.csv
@@ -11,7 +11,8 @@ Address,地址
 "Address %1 of %2","地址 %1 of %2"
 "Already registered?",已注册？
 "Apply Coupon",应用优惠券
-"Are you sure you want to remove this item from the shopping cart?",您确定要从购物车中移除该条目吗?
+"Are you sure you want to remove this item from the shopping cart?",您确定要从购物车中移除该条目吗？
+"Are you sure you would like to remove this item from the shopping cart?",您确定要从购物车移除该条目吗？
 Back,返回
 "Back to Billing Information",返回到账单信息
 "Back to Select Addresses",返回到选择地址
@@ -24,6 +25,7 @@ Back,返回
 "Cancel Coupon",取消优惠券
 "Cannot add the item to shopping cart",无法添加该条目到购物车
 "Card Verification Number Visual Reference","信用卡验证号码 视觉参考"
+"Cart Subtotal",购物车小计
 "Cart Subtotal:",购物车小计：
 Change,更改
 "Change Billing Address",更改账单地址
@@ -33,11 +35,13 @@ Checkout,结账
 "Checkout Method",支付方法
 "Checkout Terms and Conditions",结账条款和情况
 "Checkout as Guest",作为来宾结账
+"Checkout as a Guest",作为访客结账
 "Checkout as a Guest or Register",以来宾身份结账或注册
 "Checkout with Multiple Addresses",按多个地址支付
 City,城市
 "Clear Shopping Cart",清空购物车
 "Click <a href=""%1"" onclick=""this.target='_blank'"">here to print</a> a copy of your order confirmation.","单击<a href=""%1"">这里来打印</a>您订单确认信息的拷贝。"
+"Click <a href=""%1"" onclick=""this.target=\'_blank\'"">here to print</a> a copy of your order confirmation.","点击<a href=""%1"" onclick=""this。target=\'_blank\'"">这里打印</a>您的订单确认信息。"
 "Click <a href=""%1"">here</a> to continue shopping.","单击<a href=""%1"">这里</a>继续购物。"
 Close,关闭
 Company,公司
@@ -64,6 +68,7 @@ Disabled,已禁用
 "Discount Codes",折扣代码
 "Display item quantities",显示条目数量
 "Display number of items in cart",显示购物车中条目的数量
+"Easy access to your order history and status",更方便存取您的订单历史和状态
 Edit,编辑
 "Edit Address",编辑地址
 "Edit Billing Address",编辑账单地址
@@ -94,12 +99,12 @@ ID,ID
 "Incl. Tax",含税
 "Invalid checkout type",无效的结账类型
 "Invalid data",无效的数据
-"Invalid method: %1","无效的方法: %1"
+"Invalid method: %1","无效的方法： %1"
 "Invalid shipping method",无效的货运方法
 "Item not found or already ordered",无法找到条目，或条目已被订购
 Items,条目
 "Load customer quote error",载入客户报价错误
-"Loading next step...",正在载入下一步...
+"Loading next step...",正在载入下一步。。。
 Login,登录
 "Maximum qty allowed for Shipping to multiple addresses is %1",最多允许多地址运送的数量为%1
 "Minimum order amount is %1",最小的订单额为%1
@@ -112,16 +117,19 @@ Move,移动
 "New Address",新地址
 "New Condition",新条件
 "New Terms and Conditions",新建条款与协议
+"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER",在你提交订单之前订单总数将显示
 "Order #","订单 #"
 "Order Review",订单总览
 "Order Success",订购成功
 "Order place error",下订单错误
 "Other Items in Your Order",您订单中的其它条目
+"Other items in your order",您订单里的其他条目
 Password,密码
 "Payment Information",支付信息
 "Payment Method",支付方式
 "Payment method is not defined",支付方式未定义
 "Payment profile # %1: ""%2""","“支付配置文件 # %1”"
+"Payment profile # %1: ""%2"".","支付配置 # %1： ""%2""。"
 "Place Order",下订单
 "Please agree to all Terms and Conditions before placing the order.",请在下订单前同意所有的条款和条件。
 "Please agree to all Terms and Conditions before placing the orders.",请在下订单前同意所有的条款和条件。
@@ -150,6 +158,7 @@ Qty:,数量：
 Register,注册
 "Register and save time!",注册并节约时间！
 "Register to Create an Account",注册以创建帐户
+"Register with us for future convenience:",为便于使用注册：
 "Remove Item",删除条目
 "Remove This Item",删除该内容
 "Remove item",删除条目
@@ -178,7 +187,7 @@ Sales,销售
 "Shopping Cart",购物车
 "Shopping Cart is Empty",购物车为空
 "Show Content as",显示内容为
-"Sign up with us to save time on your next checkout:",注册账号以便下次结账节省时间:
+"Sign up with us to save time on your next checkout:",注册账号以便下次结账节省时间：
 "Some products quantities were recalculated because of quantity increment mismatch.",由于数量增加不匹配，一些产品书数量被重新计算了。
 "Something went wrong processing your order. Please try again later.",处理订单时发生错误，请稍后再试。
 "Something went wrong while processing your payment.",当处理支付时发生错误。
@@ -190,7 +199,7 @@ Status,状态
 "Store View",店铺视图
 "Street Address",街道地址
 "Street Address %1","街道地址 %1"
-"Submitting order information...",正在提交订单信息...
+"Submitting order information...",正在提交订单信息。。。
 Subtotal,小计
 "Subtotal must exceed minimum order amount",总数必须超出允许订购的最小数量
 Telephone,电话
@@ -198,7 +207,7 @@ Telephone,电话
 "Terms and Conditions Information",条款和条件信息
 Text,文字
 "Thank you for your purchase!",感谢您的购买！
-"Thanks for your order. We'll send you emails with order details and tracking information.",感谢选购。我们将发送一封带有订单详细跟踪信息的邮件给您
+"Thanks for your order. We'll send you emails with order details and tracking information.","感谢您订购。 我们将发送一封带有订单详细和跟踪信息的邮件给您。"
 "The condition has been saved.",条件已保存。
 "The coupon code ""%1"" is not valid.","无效的优惠券代码""%1"""
 "The coupon code ""%1"" was applied.","优惠券代码""%1""被应用"
@@ -213,6 +222,7 @@ Text,文字
 "This quote item does not exist.",报价条目不存在。
 Total,总数
 "Total for this address",该地址的总额
+Total:,总计：
 "Unable to set Payment Method",不能设置支付方法
 "Unit Price",单价
 "Update Cart",更新购物车
@@ -221,6 +231,7 @@ Total,总数
 "Update Total",更新总额
 "Use Billing Address",使用账单地址
 "VAT Number","VAT 编号"
+"View cart",查看购物车
 "We can't find the product.",找不到该产品。
 "We cannot add this item to your shopping cart",不能添加该条目到您的购物车
 "We cannot apply the coupon code.",不能应用该优惠券代码。
@@ -234,6 +245,7 @@ Total,总数
 "What's this?",这是什么？
 "You added %1 to your shopping cart.",%1被加入到了您的购物车
 "You have no items in your shopping cart.",您的购物车内没有物品。
+"You will receive an order confirmation email with details of your order and a link to track its progress.",您将收到一封含有订单详细和订单链接的确认邮件以便跟踪订单过程。
 "You will see the order total before you submit the order.",在提交该订单前您将会看到订单总额。
 "Your Checkout Progress",您的结帐流程
 "Your billing agreement # is: %1.","您的账单编号为： %1"
@@ -243,16 +255,3 @@ Total,总数
 "Your order number is ",您的订单号是
 "Your recurring payment profiles:",您的付款档案：
 "Zip/Postal Code",邮政编码
-"Are you sure you would like to remove this item from the shopping cart?","您确定要从购物车移除该条目吗？"
-"Cart Subtotal","购物车小计"
-"Checkout as a Guest","作为访客结账"
-"Click <a href=""%1"" onclick=""this.target=\'_blank\'"">here to print</a> a copy of your order confirmation.","点击<a href=""%1"" onclick=""this.target=\'_blank\'"">这里打印</a>您的订单确认信息。"
-"Easy access to your order history and status","更方便存取您的订单历史和状态"
-"ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","在你提交订单之前订单总数将显示"
-"Other items in your order","您订单里的其他条目"
-"Payment profile # %1: ""%2"".","支付配置 # %1: ""%2""."
-"Register with us for future convenience:","为便于使用注册:"
-"Thanks for your order. We'll send you emails with order details and tracking information.","感谢您订购. 我们将发送一封带有订单详细和跟踪信息的邮件给您."
-"Total:","总计："
-"View cart","查看购物车"
-"You will receive an order confirmation email with details of your order and a link to track its progress.","您将收到一封含有订单详细和订单链接的确认邮件以便跟踪订单过程。"
diff --git a/app/code/Magento/Cms/i18n/zh_CN.csv b/app/code/Magento/Cms/i18n/zh_CN.csv
index e6149f691a77..e404cf32a7c9 100644
--- a/app/code/Magento/Cms/i18n/zh_CN.csv
+++ b/app/code/Magento/Cms/i18n/zh_CN.csv
@@ -11,7 +11,7 @@ CMS,CMS
 "Collapse All",折叠全部
 Content,内容
 "Content Heading",内容标题
-"Create Folder...",创建文件夹...
+"Create Folder...",创建文件夹。。。
 "Custom Design",自定义设计
 "Custom Design From",自定义设计，来自：
 "Custom Design To",自定义设计到
@@ -61,7 +61,7 @@ Pages,页面
 "Save Block",保存区块
 "Save Page",保存页面
 "Save Process",保存过程
-"Something went wrong connecting to the host. Error#%1 - %2.","连接主机时发生错误. 错误#%1 - %2.""Static Blocks",静态块
+"Something went wrong connecting to the host. Error#%1 - %2.","连接主机时发生错误。 错误#%1 - %2。""Static Blocks"
 Status,状态
 "Storage Root",存储根目录
 "Store View",店铺视图
@@ -82,4 +82,4 @@ Title,标题
 "We cannot delete root directory %1.",不能删除根目录%1。
 "We cannot upload the file.",不能更新该文件。
 "We found a directory with the same name. Please try another folder name.",发现目录同名，请换一个再试
-px.,像素
\ No newline at end of file
+px.,像素
diff --git a/app/code/Magento/Connect/i18n/zh_CN.csv b/app/code/Magento/Connect/i18n/zh_CN.csv
index 9152b4c826c4..b3e5ea7e21bd 100644
--- a/app/code/Magento/Connect/i18n/zh_CN.csv
+++ b/app/code/Magento/Connect/i18n/zh_CN.csv
@@ -33,7 +33,7 @@ Path,路径
 Pre-1.5.0.0,Pre-1。5。0。0
 "Release Info",发布信息
 Remove,删除
-"Save As...",另存为...
+"Save As...",另存为。。。
 "Save Data and Create Package",保存数据并创建包
 "Save package with custom package file name",使用自定义包文件名保存包
 "Something went wrong creating the package.",创建包时发生错误。
diff --git a/app/code/Magento/Core/i18n/zh_CN.csv b/app/code/Magento/Core/i18n/zh_CN.csv
index 6b390abd0a62..9641911700d6 100644
--- a/app/code/Magento/Core/i18n/zh_CN.csv
+++ b/app/code/Magento/Core/i18n/zh_CN.csv
@@ -5,18 +5,21 @@
 "-- No Theme --","-- 没有主题 --"
 "-- Please Select --","-- 请选择 --"
 "A category object is required for determining the product request path.",为确定产品申请路径，必须提供分类对象。
+"About Us",关于我们
 "Add Products By SKU",通过SKU添加产品
 "Add Products to Group",添加产品到组
 "Add Products to New Option",添加产品到新选项
+"Add Products to Option ""%1""","添加产品到选项""%1"""
 "Add Selected Products",添加选择的产品
 Admin,管理员
 Advanced,高级
+"Advanced Search",高级搜索
 "An error occurred while saving. Please review the error log.",在保存时出现了错误。请查看错误日志。
 "Anchor symbol (#) is not supported in request path",锚点符号（#）不能用于请求路径中
 "Anchor symbol (#) is not supported in url rewrite suffix","URL 重写后缀不支持固定标志 （#）"
 "Are you sure you want to delete the folder named",你确定要删除该目录
 "Are you sure?",您是否确认？
-"Assign theme to your live store-view:",分配主题到你的活动店铺视图:
+"Assign theme to your live store-view:",分配主题到你的活动店铺视图：
 B,B
 Back,返回
 "Backup Options",备份选项
@@ -34,6 +37,7 @@ Cancel,取消
 "Choose existing category.",选择存在的分类。
 "Circular-reference in theme inheritance detected for ""%1""","为""%1""检测主题继承中的循环引用"
 Code,代码
+"Contact Us",联系我们
 "Controller file was loaded but class does not exist",控制器文件已载入，但类不存在
 Copy,副本
 Country,国家
@@ -48,6 +52,7 @@ Country,国家
 "Custom1 Contact Name","自定义 1 联系姓名"
 "Custom2 Contact Email","自定义 2 联系邮件"
 "Custom2 Contact Name","自定义 2 联系姓名"
+"Customer Service",客户服务
 Dashboard,仪表板
 "Date From",日期自
 "Date To",日期至
@@ -102,15 +107,16 @@ Host,主机
 "Invalid connection",无效的连接
 "Invalid messages storage ""%1"" for layout messages initialization",对布局消息初始化中无效的消息存储“%1”
 "Invalid query",无效的查询
-"Invalid regular expression: ""%1"".","无效的正则表达式: ""%1""。"
+"Invalid regular expression: ""%1"".","无效的正则表达式： ""%1""。"
 "Invalid theme loaded by theme path ""%1/%2""","主题路径""%1/%2""加载无效主题"
-"Invalid transactional email code: %1","无效的交易邮件代码: %1"
+"Invalid transactional email code: %1","无效的交易邮件代码： %1"
 "Invalid view file directory ""%1""","无效的视图文件目录""%1"""
 Layout,布局
 "Library files",库文件
 Locale,区域
 MB,MB
 "Manage Stores",管理店铺
+"Maximum length of this field must be equal or less than %1 symbols.",该字段的最大长度必须小于等于%1个符号。
 "Media Storage",媒体存储
 "Method ",方法
 "Model collection resource name is not defined.",模块集合资源名未定义。
@@ -138,19 +144,23 @@ Package,包裹
 "Please enter a number greater than 0 in this field.",请在该字段中输入大于0的数字。
 "Please enter a number lower than 100.",请输入不超过100个数字。
 "Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","请输入有效的 URL 密钥。例如， ""example-page""、""example-page。html""，或 ""anotherlevel/example-page""。"
-"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)",请输入有效URL。协议名是必须的（http://、https://，或ftp://）
+"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)",请输入有效URL。协议名是必须的（http：//、https：//，或ftp：//）
 "Please enter a valid XML-identifier. For example something_1, block5, id-4.",请输入有效的XML标识符。例如，类似something_1、block5、id-4。
 "Please enter a valid credit card number.",请输入有效的信用卡卡号。
 "Please enter a valid credit card verification number.",请输入有效的信用卡验证码。
 "Please enter a valid date.",请输入有效日期
+"Please enter a valid day (1-%1).",请输入有效的天（1-%1）。
 "Please enter a valid email address. For example johndoe@domain.com.",请输入有效邮件地址。例如johndoe@domain。com。
 "Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","请输入有效传真号码，例如 （123） 456-7890 或 123-456-7890。"
 "Please enter a valid full date",请输入有效完整日期
 "Please enter a valid month (1-12).",请输入有效月份（1-12）。
 "Please enter a valid number in this field.",请在此区域输入有效的数字。
 "Please enter a valid social security number. For example 123-45-6789.",请输入有效社会安全号码，例如123-45-6789。
+"Please enter a valid year (1900-%1).",请输入有效的年（1900-%1）。
 "Please enter a valid zip code.",请输入有效的邮政编码。
 "Please enter a valid zip code. For example 90602 or 90602-1234.",请输入有效邮编，例如90602或90602-1234。
+"Please enter a value greater than or equal to %s.",请输入一个大于等于%1的值。
+"Please enter a value less than or equal to %s.",请输入一个小于等于%s的值。
 "Please enter issue number or start date for switch/solo card type.",请输入Switch/Solo类卡的颁发号或开始日期。
 "Please input a valid CSS-length. For example 100px or 77pt or 20em or .5ex or 50%.","请输入有效 CSS长度。例如， 100px 或 77pt 或 20em 或 。5ex 或 50%。"
 "Please make sure your passwords match.",请确保密码匹配。
@@ -169,7 +179,7 @@ Package,包裹
 "Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.",该字段中请只使用字母（a-z）、数字（0-9）以及下划线（_），第一个字符应为字母。
 "Please use only visible characters and spaces.",请只使用可见字符和空格。
 "Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.",请使用这样的日期格式：dd/mm/yyyy。例如17/03/2006代表2006年3月17日。
-"Please wait, loading...",请稍候，正在加载...
+"Please wait, loading...",请稍候，正在加载。。。
 "Recent items",最近的条目
 "Request Path for Specified Store",特殊店铺的请求路径
 "Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","所请求的文件可能没有包含在父目录遍历中 （""。。/""， ""。。\\ notation）"""
@@ -188,7 +198,7 @@ Save,保存
 "Sender Email",发送人邮件
 "Sender Name",发送人姓名
 "Set as Default",设置为默认值
-"Show all...",显示所有...
+"Show all...",显示所有。。。
 "Some problem with revert action",恢复动作的有问题
 "Some problem with save action",存储动作有问题
 "Something went wrong while loading the theme.",当加载主题时发生错误。
@@ -258,20 +268,10 @@ Website,网站名称
 "Website with the same code",使用相同代码的网站
 "Wrong file info format",错误的文件信息格式
 Yes,是
-"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?",将删除您的收藏清单。该操作不可恢复。你确定要继续嘛?
+"You are about to delete your wish list. This action cannot be undone. Are you sure you want to continue?",将删除您的收藏清单。该操作不可恢复。你确定要继续嘛？
 "You can change the number of gift registry items on the Gift Registry Info page or directly in your cart, but not while in checkout.",您可以在礼物登记信息页或者在购物车修改礼物登记条目的数量，但是一定要在结账前操作。
 "You must select items to copy",你必须选择要复制的条目（s）
 "You must select items to move",你必须选择要移动的条目（s）
 "Your design change for the specified store intersects with another one, please specify another date range.",您对指定商店设计的更改和另一个有交叉，请重新指定日期范围。
 "database ""%1""","数据库 ""%1"""
 "start typing to search category",开始输入来搜索分类
-"Add Products to Option ""%1""","添加产品到选项""%1"""
-"Maximum length of this field must be equal or less than %1 symbols.","该字段的最大长度必须小于等于%1个符号。"
-"Please enter a valid day (1-%1).","请输入有效的天(1-%1)。"
-"Please enter a valid year (1900-%1).","请输入有效的年(1900-%1)。"
-"Please enter a value greater than or equal to %s.","请输入一个大于等于%1的值。"
-"Please enter a value less than or equal to %s.","请输入一个小于等于%s的值。"
-"About Us","关于我们"
-"Customer Service","客户服务"
-"Advanced Search","高级搜索"
-"Contact Us","联系我们"
diff --git a/app/code/Magento/Customer/i18n/zh_CN.csv b/app/code/Magento/Customer/i18n/zh_CN.csv
index c5b7d7dc447a..7d746ef038f0 100644
--- a/app/code/Magento/Customer/i18n/zh_CN.csv
+++ b/app/code/Magento/Customer/i18n/zh_CN.csv
@@ -1,5 +1,6 @@
 "* Required Fields",*必要字段
 "ALL GROUPS",所有群组
+"Account Dashboard",账户面板
 "Account Information",帐户信息
 "Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%1"">click here</a>.","帐户信息是必须的。请使用您电子邮件中的确认链接。要重新发送确认电子邮件，请 <a href=""%1"">点击这里</a>。"
 "Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%1"">click here</a>.","帐户信息是必须的。请使用您电子邮件中的确认链接。要重新发送确认电子邮件，请 <a href=""%1"">点击这里</a>。"
@@ -28,6 +29,7 @@ Approved,已批准
 Back,返回
 "Back to Login",返回到登录界面
 "Bad request.",请求有误。
+"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.",在我们店铺创建一个账号，将便于您更快结账，存储多个运送地址、查看和跟踪订单还有更多。
 CSV,CSV
 Cancel,取消
 "Cannot save a new password.",无法保存新密码。
@@ -95,11 +97,13 @@ Email:,电子邮件：
 Fax,传真
 "First Name",名字
 "Forgot Your Password?",忘记您的密码？
+"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.",从账户面板能查看您最近的账户活动情况和更新账户信息。选择下面的链接查看或编辑信息。
 "From your dashboard you can review recent account activity and edit your account information.",从仪表盘能查看您的近期账户活动和编辑账户信息。
 Gender,性别
 "Gender is required.",需提供性别信息。
 "General Subscription",常规订阅
 Global,全球
+"Go back",回退
 "Grand Total",总计
 Group,分组
 "Group Information",群组信息
@@ -112,6 +116,7 @@ ID,ID
 "If there is an account associated with %1 you will receive an email with a link to reset your password.","如果有关联给 %1 的账户，你将收到一封包含重设密码链接的电子邮件。"
 "If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you billing address for proper VAT calculation","如果你是已注册的 VAT 顾客，请点击 <a href=""%1"">这里</a> 输入帐单地址，以准确计算 VAT"
 "If you are a registered VAT customer, please click <a href=""%1"">here</a> to enter you shipping address for proper VAT calculation","如果你是已注册的 VAT 顾客，请点击<a href=""%1"">这里</a>输入发货地址，以准确计算 VAT"
+"If you have an account with us, log in using your email address.",如果您已经有了一个账户，请使用您的邮件地址登录。
 "If you have an account with us, please log in.",如果您拥有账户，请登录。
 "Invalid current password",当前密码无效
 "Invalid login or password.",无效的登录名或密码。
@@ -149,6 +154,7 @@ Never,永不
 Newsletter,新闻邮件
 "Newsletter Information",新闻邮件信息
 "Newsletter Subscription",新闻邮件订阅
+"Newsletter Subscriptions",邮件订阅
 Newsletters,新闻邮件
 "No Newsletter Found",未找到新闻邮件
 "No item specified.",未指定条目
@@ -169,7 +175,7 @@ Pending,挂起
 "Per Website",每网站
 "Personal Information",个人信息
 "Please correct the email address.",请纠正邮件地址。
-"Please correct this email address: ""%1"".","请纠正该邮件地址: ""%1""。"
+"Please correct this email address: ""%1"".","请纠正该邮件地址： ""%1""。"
 "Please enter a valid date between %1 and %2 at %3.","请在%1输入介于%2 与 %3 之间的有效日期。"
 "Please enter a valid date equal to or greater than %1 at %2.","请在 %1 输入等于或大于 %2 的有效日期。"
 "Please enter a valid date less than or equal to %1 at %2.","请在 %2 输入小于或等于 %1 的有效日期。"
@@ -181,6 +187,8 @@ Pending,挂起
 "Please enter the street.",请输入街道。
 "Please enter the telephone number.",请输入电话号码。
 "Please enter the zip/postal code.",请输入邮编。
+"Please enter your email address below. You will receive a link to reset your password.",在下面输入邮件地址，您将接收到一封带有密码重置链接的邮件。
+"Please enter your email below and we will send you the confirmation link for it.",在下面输入邮件地址我们将发送一封带有确认链接的邮件给您。
 "Please enter your email below and we'll send you confirmation link for it.",请在下面输入您的邮件地址，我们将发送确认链接。
 "Please enter your email.",请输入您的电子邮件。
 "Please make sure your passwords match.",请确保密码匹配。
@@ -195,6 +203,7 @@ Product,产品
 "Product Reviews",产品评论
 Qty,数量
 "Recent Orders",近期订单
+"Recurring Profiles",周期配置
 Refunded,已存储
 "Registered Customers",已注册的客户
 Remove,删除
@@ -229,6 +238,7 @@ Store,商店
 Subject,主题
 Submit,提交
 "Subscribe to Newsletter",订阅到新闻通讯
+"Subscription option",订阅选项
 "Tax Class",税率
 "Tax/VAT number",税/增值税号码
 Telephone,电话
@@ -251,6 +261,7 @@ Text,文字
 "The password can not begin or end with a space.",密码不能以空格开头或者结束。
 "The password must have at least %1 characters.",密码必须有至少%1个字符。
 "There are no items in customer's shopping cart at the moment",客户的购物车中目前没内容
+"There are no recurring profiles yet.",还没有周期配置。
 "There is already an account with this email address. If you are sure that it is your email address, <a href=""%1"">click here</a> to get your password and access your account.","已经存在一个同名邮件地址的账号。如果您确定这就是您的邮件地址，<a href=""%1"">点击这里</a>得到密码来访问您的账户信息。"
 "There was an error validating the VAT ID.","验证 VAT ID 时出错。"
 "This account is not confirmed.",该帐户尚未确认。
@@ -283,15 +294,18 @@ Wishlist,收藏清单
 "Wrong transactional account email type",错误的交易账户电子邮件类型
 Year,年
 "Year (YYYY)",YYYY
+"You are currently not subscribed to any newsletter.",您暂未订阅新闻邮件。
 "You are currently not subscribed to our newsletter.",您目前没有订阅我们的时事通讯。
 "You are now logged out",您已注销
 "You do not subscribe to a newsletter.",不订阅新闻邮件。
 "You have logged out and will be redirected to our homepage in 5 seconds.",您已退出，5秒钟内会回到首页。
+"You have no additional address entries in your address book.",地址簿中没有其他的地址。
 "You have no additional entries in your address book.",您的地址簿里有没有额外的条目。
 "You have no default billing address in your address book.",您的地址薄中没有默认账单地址。
 "You have no default entries in your address book.",您的地址薄里没有默认的条目。
 "You have no default shipping address in your address book.",您的地址薄中没有默认运送地址。
 "You have no more address entries in your address book.",您的地址簿中没有更多地址。
+"You have not purchased any downloadable products yet.",您尚未购买任何可下载的产品。
 "You have not set a default billing address.",您还没有设置默认的账单地址。
 "You have not set a default shipping address.",您尚未设置默认的运送地址。
 "You subscribe to our newsletter.",订阅新闻邮件。
@@ -304,17 +318,3 @@ Year,年
 "Your password reset link has expired.",你的密码重设链接已过期。
 ZIP,邮编
 "Zip/Postal Code",邮政编码
-"Account Dashboard","账户面板"
-"Recurring Profiles","周期配置"
-"Newsletter Subscriptions","邮件订阅"
-"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","从账户面板能查看您最近的账户活动情况和更新账户信息。选择下面的链接查看或编辑信息。"
-"You are currently not subscribed to any newsletter.","您暂未订阅新闻邮件。"
-"You have no additional address entries in your address book.","地址簿中没有其他的地址。"
-"Go back","回退"
-"You have not purchased any downloadable products yet.",您尚未购买任何可下载的产品。
-"Subscription option",订阅选项
-"There are no recurring profiles yet.","还没有周期配置。"
-"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","在我们店铺创建一个账号，将便于您更快结账，存储多个运送地址、查看和跟踪订单还有更多。"
-"If you have an account with us, log in using your email address.","如果您已经有了一个账户，请使用您的邮件地址登录。"
-"Please enter your email address below. You will receive a link to reset your password.","在下面输入邮件地址，您将接收到一封带有密码重置链接的邮件。"
-"Please enter your email below and we will send you the confirmation link for it.","在下面输入邮件地址我们将发送一封带有确认链接的邮件给您。"
diff --git a/app/code/Magento/DesignEditor/i18n/zh_CN.csv b/app/code/Magento/DesignEditor/i18n/zh_CN.csv
index 135752a9d36b..7eebbac00001 100644
--- a/app/code/Magento/DesignEditor/i18n/zh_CN.csv
+++ b/app/code/Magento/DesignEditor/i18n/zh_CN.csv
@@ -3,12 +3,12 @@
 "Add Files",加入文件
 "Add white borders to images that are smaller than the container.",添加白边到那些比容器小的图片。
 "Alternative Text",备选文本
-"Are you sure you want to delete this file?",您确定要删除该文件吗?
-"Are you sure you want to delete this folder?",您确定要删除该目录吗?
-"Are you sure you want to delete this theme?",您确定要删除该主题吗?
+"Are you sure you want to delete this file?",您确定要删除该文件吗？
+"Are you sure you want to delete this folder?",您确定要删除该目录吗？
+"Are you sure you want to delete this theme?",您确定要删除该主题吗？
 "Assign New Theme",分配新主题
 "Assign to a Store View",分配到一个店铺视图
-"Assigned to: ",分配给:
+"Assigned to: ",分配给：
 "Available Themes",可用的主题
 Backgrounds,背景
 "Browse Files",浏览文件
@@ -24,8 +24,8 @@ CSS,CSS
 "Custom javascript files",定制Javascript文件
 "Delete %1 Theme",删除主题%1
 "Delete file",删除文件
-"Do you want to restore the theme defaults?",你想恢复默认主题吗?
-"Do you want to restore the version saved at %1?",您像恢复存储在%1的版本吗?
+"Do you want to restore the theme defaults?",你想恢复默认主题吗？
+"Do you want to restore the version saved at %1?",您像恢复存储在%1的版本吗？
 "Download File",下载文件
 "Download file",下载文件
 "Drag and drop files to reorder them.",拖拽文件对其重新排序。
diff --git a/app/code/Magento/Directory/i18n/zh_CN.csv b/app/code/Magento/Directory/i18n/zh_CN.csv
index 979495ae21bb..326817eca031 100644
--- a/app/code/Magento/Directory/i18n/zh_CN.csv
+++ b/app/code/Magento/Directory/i18n/zh_CN.csv
@@ -5,7 +5,7 @@ Country,国家
 Currency,币种
 Enabled,已启用
 "FATAL ERROR:",致命错误：
-"Please correct the country code: %1.","请纠正货币代码: %1。"
+"Please correct the country code: %1.","请纠正货币代码： %1。"
 "Please correct the rates received",请纠正所得比率
 "Please correct the target currency.",请纠正目标货币。
 "Please specify the correct Import Service.",请指定正确导入服务。
@@ -14,4 +14,4 @@ State/Province,州/省
 WARNING:,警告：
 "We can't initialize the import model.",不能初始化导入模型。
 "We can't retrieve a rate from %1.",不能从%1检索一个比率。
-"Your current currency is: %1.","您当前货币是: %1。"
+"Your current currency is: %1.","您当前货币是： %1。"
diff --git a/app/code/Magento/Downloadable/i18n/zh_CN.csv b/app/code/Magento/Downloadable/i18n/zh_CN.csv
index b3c485a7aa56..1f02cdfd6f98 100644
--- a/app/code/Magento/Downloadable/i18n/zh_CN.csv
+++ b/app/code/Magento/Downloadable/i18n/zh_CN.csv
@@ -47,7 +47,7 @@ Sample,范例
 "See price before order confirmation.",确认订单前显示价格。
 Shareable,可分享
 Shipped,已发货
-"Something went wrong connecting to the host. Error: %1.","连接主机时发生错误: %1。"
+"Something went wrong connecting to the host. Error: %1.","连接主机时发生错误： %1。"
 "Something went wrong while getting the requested content.",当获取请求内容时发生错误。
 "Something went wrong while saving the file(s).",当存储文件时发生错误。
 "Sorry, there was an error getting requested content. Please contact the store owner.","很抱歉， 获取请求内容时发生错误。 请联系店主。"
diff --git a/app/code/Magento/GiftMessage/i18n/zh_CN.csv b/app/code/Magento/GiftMessage/i18n/zh_CN.csv
index 4971e4caa972..b1a0b47d810a 100644
--- a/app/code/Magento/GiftMessage/i18n/zh_CN.csv
+++ b/app/code/Magento/GiftMessage/i18n/zh_CN.csv
@@ -5,7 +5,8 @@ Add,添加
 "Add gift options.",添加礼品选项。
 "Are you sure?",您是否确认？
 Cancel,取消
-"Does your order include gift items?",你的订单包含礼物条目吗?
+"Do you have any gift items in your order?",您的订单里有礼物条目吗？
+"Does your order include gift items?",你的订单包含礼物条目吗？
 Edit,编辑
 From,来自
 "Gift Message",礼品消息
@@ -13,6 +14,7 @@ From,来自
 "Gift Options for Individual Items",适用于单个条目的礼品选项
 "Gift Options for the Entire Order",为整个订单的礼物选项
 "Gift Options for this address",为该地址的礼物设置
+"Gift Options for this address.",该地址的礼物选项。
 "Item %1 of %2","第 %1 个条目，共 %2 个"
 Message,信息
 No,否
@@ -24,11 +26,9 @@ To,发送至
 "Unknown entity type",未知实体类型
 "Use config",用户配置
 Yes,是
+"You can leave a box blank if you don't wish to add a gift message for the item.",如果您不想为该条目添加一条礼物留言请留空。
+"You can leave this box blank if you do not wish to add a gift message for the item.",如果您不想为该条目添加一条礼物留言请留空。
+"You can leave this box blank if you do not wish to add a gift message for this address.",如果您不想为该地址添加一条礼物留言请留空。
 "You can leave this box empty if you don't want to add a gift message for the whole order.",如果你不想为整个订单添加礼物留言请留空。
 "You can leave this box empty if you don't want to add a gift message for this address.",如果你不想为该地址添加礼物留言请留空。
 "You can leave this box empty if you don't want to add a gift message to this item.",如果你不想为该条目添加礼物留言请留空。
-"Do you have any gift items in your order?","您的订单里有礼物条目吗？"
-"Gift Options for this address.","该地址的礼物选项。"
-"You can leave a box blank if you don't wish to add a gift message for the item.","如果您不想为该条目添加一条礼物留言请留空."
-"You can leave this box blank if you do not wish to add a gift message for the item.","如果您不想为该条目添加一条礼物留言请留空."
-"You can leave this box blank if you do not wish to add a gift message for this address.","如果您不想为该地址添加一条礼物留言请留空."
diff --git a/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv b/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv
index ac525a36465b..dcb1297b2148 100644
--- a/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv
+++ b/app/code/Magento/GoogleOptimizer/i18n/zh_CN.csv
@@ -4,7 +4,7 @@ Attributes,属性
 Enable,启用
 "Experiment Code",实验代码
 "Google Analytics Content Experiments Code","Google Analytics内容实验代码"
-"Note: Experiment code should be added to the original page only.","注: 实验代码应该被仅仅加入到发起页。"
+"Note: Experiment code should be added to the original page only.","注： 实验代码应该被仅仅加入到发起页。"
 Other,其它
 "Page View Optimization",页面视图优化
 "Product View Optimization",产品视图优化
diff --git a/app/code/Magento/GoogleShopping/i18n/zh_CN.csv b/app/code/Magento/GoogleShopping/i18n/zh_CN.csv
index 7655930ff66d..304d8dc68eab 100644
--- a/app/code/Magento/GoogleShopping/i18n/zh_CN.csv
+++ b/app/code/Magento/GoogleShopping/i18n/zh_CN.csv
@@ -14,11 +14,11 @@ AuthSub,AuthSub
 "Captcha has been confirmed.",Captcha已经被确认。
 ClientLogin,客户登录
 Confirm,确认
-"Current Mapping will be reloaded. Continue?","当前映射将被重载。 要继续吗?"
+"Current Mapping will be reloaded. Continue?","当前映射将被重载。 要继续吗？"
 "Custom attribute, no mapping",定制属性，不映射
 "Delete Mapping",删除映射
 "Edit attribute set mapping",编辑属性集映射
-"Error: %1","错误: %1"
+"Error: %1","错误： %1"
 "Errors happened during synchronization with Google Shopping","在同步Google Shopping期间发生错误"
 "Errors happened while adding products to Google Shopping.","当添加产品到Google Shopping发生错误。"
 "Errors happened while deleting items from Google Shopping","当从Google Shopping删除条目时发生错误"
@@ -59,8 +59,8 @@ SKU,SKU
 "The item ""%1"" hasn't been updated.","条目""%1""还没有被更新。"
 "The product ""%1"" cannot be added to Google Content. %2","产品""%1""不能被添加到Google Content。 %2"
 "The product ""%1"" hasn't been added to Google Content.","产品""%1""还没有被添加Google Content。"
-"There was a Captcha confirmation error: %1","发生Captcha确认错误: %1"
-"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","该操作将要更新条目的属性并且移除Google Content中无效的条目。如果一个属性从映射中删除，它也将从Google中删除。你确定要继续吗?"
+"There was a Captcha confirmation error: %1","发生Captcha确认错误： %1"
+"This action will update items' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?","该操作将要更新条目的属性并且移除Google Content中无效的条目。如果一个属性从映射中删除，它也将从Google中删除。你确定要继续吗？"
 "Total of %1 items(s) have been removed from Google Shopping.","共%1个条目已经从Google Shopping移除。"
 "Unable to select a Store View",不能选择店铺视图
 "View Item in Google Content","查看Google Content里的条目"
diff --git a/app/code/Magento/ImportExport/i18n/zh_CN.csv b/app/code/Magento/ImportExport/i18n/zh_CN.csv
index e3cec8086ff4..5e87f476268c 100644
--- a/app/code/Magento/ImportExport/i18n/zh_CN.csv
+++ b/app/code/Magento/ImportExport/i18n/zh_CN.csv
@@ -8,10 +8,10 @@
 "Begin export of %1",开始%1的导入
 "Begin import of ""%1"" with ""%2"" behavior","开始导入用""%2""行为导入""%1"""
 "Cannot determine attribute filter type",不能检测属性过滤器类型
-"Cannot find required columns: %1","找不到必须的列: %1"
+"Cannot find required columns: %1","找不到必须的列： %1"
 "Cannot get autoincrement value",不能得到子增量值
 "Check Data",检查数据
-"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","核对的行: %1， 核对的实体: %2， 无效的行: %3， 总错误数: %4"
+"Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","核对的行： %1， 核对的实体： %2， 无效的行： %3， 总错误数： %4"
 "Column names: ""%1"" are invalid","列名""%1""是无效的"
 "Columns number: ""%1"" have empty headers","列号""%1""标题为空"
 Continue,继续
@@ -34,7 +34,7 @@ Continue,继续
 "Entity adapter object must be an instance of %1 or %2",尸体适配器对象必须是%1或%2的实例
 "Entity is unknown",未知实体
 "Entity type model must be an instance of \Magento\ImportExport\Model\Export\Entity\Product\Type\AbstractType","实体类型模块必须为\Magento\ImportExport\Model\Export\Entity\Product\Type\AbstractType的实例"
-"Error in data structure: %1 values are mixed","数据结构错误: %1的值是混合的"
+"Error in data structure: %1 values are mixed","数据结构错误： %1的值是混合的"
 "Errors limit (%1) reached. Please fix errors and re-upload file.",达到错误极限（%1）。请修正错误然后重新上传文件。
 Export,导出
 "Export File Format",导出文件格式
@@ -67,7 +67,7 @@ Import/Export,导入/导出
 "Invalid custom option value price.",无效的定制选项值价格。
 "Invalid custom option value sort order.",无效的定制选项值排序。
 "Invalid password length",无效的密码长度
-"Invalid value in Store column (store does not exists?)",店铺列的值无效（店铺不存在?）
+"Invalid value in Store column (store does not exists?)",店铺列的值无效（店铺不存在？）
 "Option entity must have a parent product entity.",选项实体必须有一个父产品实体。
 "Orphan rows that will be skipped due default row errors",由于默认行错误，孤儿行将被跳过
 "Please correct the data sent.",请纠正送出的数据。
@@ -99,4 +99,4 @@ Status,状态
 "Validation finished successfully",成功完成校验。
 "Website is not specified",未指定站点
 "in rows",在行
-"in rows:",在行:
+"in rows:",在行：
diff --git a/app/code/Magento/Index/i18n/zh_CN.csv b/app/code/Magento/Index/i18n/zh_CN.csv
index 698d83375f3a..b88dd87b1e35 100644
--- a/app/code/Magento/Index/i18n/zh_CN.csv
+++ b/app/code/Magento/Index/i18n/zh_CN.csv
@@ -20,7 +20,7 @@ Index,索引
 Mode,模式
 Never,永不
 No,否
-"One or more of the Indexes are not up to date: %1","一个或更多索引过期: %1"
+"One or more of the Indexes are not up to date: %1","一个或更多索引过期： %1"
 "Please go to <a href=""%1"">Index Management</a> and rebuild required indexes.","请去<a href=""%1"">索引管理</a>重建必需的索引。"
 "Please select Index(es)",请选择索引
 "Please select Indexes",请选择索引
diff --git a/app/code/Magento/Install/i18n/zh_CN.csv b/app/code/Magento/Install/i18n/zh_CN.csv
index 388149a50a61..9e1ec43f8d3e 100644
--- a/app/code/Magento/Install/i18n/zh_CN.csv
+++ b/app/code/Magento/Install/i18n/zh_CN.csv
@@ -64,7 +64,7 @@ Password,密码
 "Please make sure that <code>mod_rewrite</code> is enabled in Apache configuration.",请确保在Apache配置中启用了<code>mod_rewrite</code>。
 "Please set all required settings before clicking ""Continue"".","在单击""继续""之前请设置所有必须的设置选项。"
 "Proceed With Automatic Download (%1)",正在处理自动下载（%1）
-"Provide a complete base URL for SSL connection. For example: %1.",请为SSL连接提供一个完整的基础URL。例:%1。
+"Provide a complete base URL for SSL connection. For example: %1.",请为SSL连接提供一个完整的基础URL。例：%1。
 "Report All Bugs",报告所有Bug
 "Required Fields",必须的字段
 "Response from the server is invalid.",来自服务器的响应无效。
@@ -82,7 +82,7 @@ Password,密码
 "The URL ""%1"" is not accessible.","URL “%1” 无法访问。"
 "The database server version doesn't match system requirements (required: %1, actual: %2).",数据库服务器版本不满足要求（需要：%1，实际：%2）。
 "The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_); the first character should be a letter.",表前缀应该仅仅包含字母（a-z）、数字（0-9）或者下划线（_）;首字母必须是字母。
-"This is the additional path used after your base URL to access your store Admin (e.g, Admin).",这是另外的路径附加到你的基础URL用来存取店铺管理（如:Admin）。
+"This is the additional path used after your base URL to access your store Admin (e.g, Admin).",这是另外的路径附加到你的基础URL用来存取店铺管理（如：Admin）。
 "Time Zone",时区
 "Use Secure URLs (SSL)",使用安全URL（SSL）
 "Use Web Server (Apache) Rewrites",使用Web服务器（Apache）重写
@@ -92,5 +92,5 @@ Username,用户名
 Validation,验证
 "Web access options",Web访问选项
 Welcome,欢迎
-"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","您可以指定服务器端口，例如： localhost:3307<br />如果没有使用默认的UNIX socket，则可以在此指定，而不用在主机中指定，例如： /var/run/mysqld/mysqld。sock"
+"You can specify server port, ex.: localhost:3307<br />If you are not using default UNIX socket, you can specify it here instead of host, ex.: /var/run/mysqld/mysqld.sock","您可以指定服务器端口，例如： localhost：3307<br />如果没有使用默认的UNIX socket，则可以在此指定，而不用在主机中指定，例如： /var/run/mysqld/mysqld。sock"
 "You could enable this option to use web server rewrites functionality for improved search engines optimization.",您可以启用该选项，以便通过Web服务器的重写功能改善搜索引擎优化效果。
diff --git a/app/code/Magento/Integration/i18n/zh_CN.csv b/app/code/Magento/Integration/i18n/zh_CN.csv
index 1c09b45e0584..2e7aeade96df 100644
--- a/app/code/Magento/Integration/i18n/zh_CN.csv
+++ b/app/code/Magento/Integration/i18n/zh_CN.csv
@@ -1,14 +1,14 @@
-"Add New Integration","添加新集成"
-"Authentication","认证"
+"Add New Integration",添加新集成
+Authentication,认证
 "Edit ""%1"" Integration","编辑""%1""集成"
-"Integration","集成"
-"Integration ID is not specified or is invalid.","未指定或指定了无效的集成ID。"
-"Integration Info","集成信息"
-"Integration Information","集成信息"
-"Integration Name","集成名"
-Integrations,"集成"
-"New Integration","新集成"
+Integration,集成
+"Integration ID is not specified or is invalid.",未指定或指定了无效的集成ID。
+"Integration Info",集成信息
+"Integration Information",集成信息
+"Integration Name",集成名
+Integrations,集成
+"New Integration",新集成
 OAuth,OAuth
-"Please enter endpoint for oAuth.","请输入oAuth的端点。"
-"The integration '%1' has been saved.","集成'%1'已经被存储。"
-"This integration no longer exists.","集成不存在。"
\ No newline at end of file
+"Please enter endpoint for oAuth.",请输入oAuth的端点。
+"The integration '%1' has been saved.",集成'%1'已经被存储。
+"This integration no longer exists.",集成不存在。
diff --git a/app/code/Magento/Newsletter/i18n/zh_CN.csv b/app/code/Magento/Newsletter/i18n/zh_CN.csv
index df63e3df6c92..36bee6ceeb7e 100644
--- a/app/code/Magento/Newsletter/i18n/zh_CN.csv
+++ b/app/code/Magento/Newsletter/i18n/zh_CN.csv
@@ -42,7 +42,7 @@ Paused,已暂停
 Preview,预览
 "Preview Template",预览模板
 "Queue Information",队列信息
-"Queue Newsletter...",队列新闻邮件...
+"Queue Newsletter...",队列新闻邮件。。。
 Reset,重置状态
 Resume,恢复
 "Return HTML Version",返回HTML版本
diff --git a/app/code/Magento/Oauth/i18n/zh_CN.csv b/app/code/Magento/Oauth/i18n/zh_CN.csv
index a11ca6b044f2..470f43236af8 100644
--- a/app/code/Magento/Oauth/i18n/zh_CN.csv
+++ b/app/code/Magento/Oauth/i18n/zh_CN.csv
@@ -5,8 +5,8 @@ Add-Ons,扩展集
 "An error occurred on saving consumer data.",存储消费者数据时发生错误。
 "An error occurred validating the nonce.",校验特定场合时发生错误。
 "An error occurred while deleting the add-on.",删除扩展时发生错误。
-"Are you sure you want to disable this application?",你确定要禁止该应用嘛?
-"Are you sure you want to enable this application?",你确定要允许该应用嘛?
+"Are you sure you want to disable this application?",你确定要禁止该应用嘛？
+"Are you sure you want to enable this application?",你确定要允许该应用嘛？
 "Callback URL",回调URL
 "Edit Add-On",编辑扩展
 "Http Post URL",Http提交URL
diff --git a/app/code/Magento/Ogone/i18n/zh_CN.csv b/app/code/Magento/Ogone/i18n/zh_CN.csv
index 3ddcfacddde8..647b6932ded5 100644
--- a/app/code/Magento/Ogone/i18n/zh_CN.csv
+++ b/app/code/Magento/Ogone/i18n/zh_CN.csv
@@ -13,7 +13,7 @@ Magento,Magento
 Ogone,Ogone
 "Ogone Default Operation",Ogone默认操作
 "Order can't save",订单无法保存
-"Payment ID: %1","支付ID: %1"
+"Payment ID: %1","支付ID： %1"
 "Pending Ogone",挂起的Ogone
 "Please stand by. In a moment, this page will transfer your data to the Ogone payment gateway.","请稍等， 此刻页面将要传输数据到Ogone支付网关。"
 "Processed Ogone Payment",已处理的Ogone支付
diff --git a/app/code/Magento/Page/i18n/zh_CN.csv b/app/code/Magento/Page/i18n/zh_CN.csv
index d8b5f9cbf723..64682add1cbd 100644
--- a/app/code/Magento/Page/i18n/zh_CN.csv
+++ b/app/code/Magento/Page/i18n/zh_CN.csv
@@ -20,7 +20,7 @@ Language,语言
 Minute,分
 Next,下一个
 Previous,上一个
-Redirecting...,正在重定向...
+Redirecting...,正在重定向。。。
 "Report All Bugs",报告所有Bug
 "Select Store",选择店铺
 Show,显示
diff --git a/app/code/Magento/Paygate/i18n/zh_CN.csv b/app/code/Magento/Paygate/i18n/zh_CN.csv
index b8cb8df2f096..14280ff7037b 100644
--- a/app/code/Magento/Paygate/i18n/zh_CN.csv
+++ b/app/code/Magento/Paygate/i18n/zh_CN.csv
@@ -17,7 +17,7 @@ Enabled,已启用
 "Payment voiding error.",支付的作废出错。
 "Please enter a different credit card number to complete your purchase.",请输入另外的信用卡号来完成购买。
 "Processed Amount",处理的额度
-Processing...,处理中...
+Processing...,处理中。。。
 "Remaining Balance",剩下的余额
 "Something went wrong canceling the transactions.",当取消交易时发生错误。
 "Something went wrong in the payment gateway.",支付网关发生错误。
diff --git a/app/code/Magento/Paypal/i18n/zh_CN.csv b/app/code/Magento/Paypal/i18n/zh_CN.csv
index 69b2f2afd5c1..2f1125010a42 100644
--- a/app/code/Magento/Paypal/i18n/zh_CN.csv
+++ b/app/code/Magento/Paypal/i18n/zh_CN.csv
@@ -116,7 +116,7 @@ Funding,退款
 Help,帮助
 "Hidden Virtual PayPal Debit Card Transaction",隐藏虚拟PayPal借记卡交易
 "Hold for Dispute Investigation",保留做争议调查
-"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1""。 %2 交易额 %3。 交易ID: ""%4"""
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1""。 %2 交易额 %3。 交易ID： ""%4"""
 "IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1""。 一个争议已经被解决并关闭。 %2 交易额 %3。"
 "IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1""。 案例类型""%2""。 案例ID ""%3"" %4"
 Incentive,奖励
@@ -164,7 +164,7 @@ No,否
 "No Logo",没有标示
 "No match",无匹配结果
 "None of the address information matched",无匹配地址信息
-"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","不确定什么PayPal支付方法被使用?点击<a href=""%1"" target=""_blank"">这里</a>学习更多。"
+"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","不确定什么PayPal支付方法被使用？点击<a href=""%1"" target=""_blank"">这里</a>学习更多。"
 "Note: %1",注意：%1
 "Now accepting PayPal (150 X 40)",现在接受PayPal（150X40）
 "Now accepting PayPal (150 X 60)",现在接受PayPal（150X60）
@@ -204,7 +204,7 @@ Phone,电话
 "Please agree to all the terms and conditions before placing the order.",请在下订单前同意所有的条款和条件。
 "Please do not refresh the page until you complete payment.",请不要刷新该页面，直到付款完成。
 "Please re-enable the previously enabled payment solutions.",请重新允许以前允许的支付方案。
-"Please select a shipping method...",请选择送货方法...
+"Please select a shipping method...",请选择送货方法。。。
 "Please select region, state or province",请选择地区、州，或省
 "Please update order data to get shipping methods and rates",请更新订单数据，获取配送方式和价格
 "Points Incentive Redemption",兑换奖励点
@@ -249,7 +249,7 @@ State/Province,州/省
 Static,静态
 "Street Address",街道地址
 "Street Address %1","街道地址 %1"
-"Submitting order information...",正在提交订单信息...
+"Submitting order information...",正在提交订单信息。。。
 "Subscription ID",订阅ID
 "Subscription Payment, either payment sent or payment received",订阅支付，可通过发出或收到的付款进行
 Subtotal,小计
@@ -257,7 +257,7 @@ Subtotal,小计
 "The PayPal certificate file is empty.",PayPal证书文件为空。
 "The PayPal gateway has rejected this request. %1","PayPal网关已经拒绝了该请求。 %1"
 "The authorized amount is %1.",授权金额为%1。
-"The following error(s) occured:",下列错误发生:
+"The following error(s) occured:",下列错误发生：
 "The maximum number of child authorizations is reached.",授权子帐户的最大数量已达到。
 "The merchant account is not yet verified.",银行帐户尚未验证。
 "The merchant holds a non-U.S. account and does not have a withdrawal mechanism.",该商家持有一个非美国账户并且没有取款功能。
@@ -271,7 +271,7 @@ Subtotal,小计
 "The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.",支付是通过信用卡进行的。为了收到资金，银行必须将帐户升级为商业或白金状态。
 "The schedule description is too long.",时间表描述太长。
 "The subscriber name is too long.",订阅者名字太长。
-"There is already another PayPal solution enabled. Enable this solution instead?",已经允许了另一个PayPal方案，要替代允许该方案吗?
+"There is already another PayPal solution enabled. Enable this solution instead?",已经允许了另一个PayPal方案，要替代允许该方案吗？
 "This customer did not include a confirmed address.",客户没有包含确认地址。
 "This operation requires an existing transaction object.",该操作需要一个现有的交易目标。
 Title,标题
@@ -293,7 +293,7 @@ View,查看
 "Virtual PayPal Debit Card Transaction",虚拟PayPal借记卡交易
 "Virtual Terminal Payment",虚拟终端支付
 Void,无效
-"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","我们正在连接到PayPal SFTP服务器来检索新的报表。你确定要继续吗?"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","我们正在连接到PayPal SFTP服务器来检索新的报表。你确定要继续吗？"
 "We can't change the status because the current status doesn't match the real status.",因为当前状态与真实状态不匹配不能改变该状态。
 "We can't contact the PayPal gateway.",无法联系PayPal网关。
 "We can't initialize Express Checkout review.","无法初始化Express Checkout评审。"
diff --git a/app/code/Magento/PaypalUk/i18n/zh_CN.csv b/app/code/Magento/PaypalUk/i18n/zh_CN.csv
index b725248999a0..0eb37037a11a 100644
--- a/app/code/Magento/PaypalUk/i18n/zh_CN.csv
+++ b/app/code/Magento/PaypalUk/i18n/zh_CN.csv
@@ -1,6 +1,6 @@
 "Change Payment Method",变更支付方法
 "Fetch transaction details method does not exists in PaypalUK",PaypalUK没有找到交易详细方法
 "PayPal gateway rejected the request. %1","PayPal网关拒绝了该请求。 %1"
-"Payer Email: %1","支付者邮件地址: %1"
-"Payflow PNREF: #%1.","Payflow PNREF: #%1。"
+"Payer Email: %1","支付者邮件地址： %1"
+"Payflow PNREF: #%1.","Payflow PNREF： #%1。"
 "Update Shipping Method",更新货运方法
diff --git a/app/code/Magento/Persistent/i18n/zh_CN.csv b/app/code/Magento/Persistent/i18n/zh_CN.csv
index f86c540c7d9a..b00f02e6a0c1 100644
--- a/app/code/Magento/Persistent/i18n/zh_CN.csv
+++ b/app/code/Magento/Persistent/i18n/zh_CN.csv
@@ -1,4 +1,4 @@
-"(Not %1?)",（非%1?）
+"(Not %1?)",（非%1？）
 "* Required Fields",*必要字段
 Address,地址
 "Address Information",地址信息
@@ -20,7 +20,7 @@ Fax,传真
 "Forgot your password?",忘记您的密码？
 "Get easy access to your order history and status.",更容易存取订单历史和状态。
 "If you have an account with us, please log in.",如果您拥有账户，请登录。
-"Loading next step...",正在载入下一步...
+"Loading next step...",正在载入下一步。。。
 Login,登录
 "Login Information",登录信息
 "Login or Create an Account",登录或创建帐户
@@ -41,7 +41,7 @@ Register,注册
 "Ship to different address",送货到不同地址
 "Ship to this address",送货到这个地址
 "Sign Up for Newsletter",订阅新闻邮件
-"Sign up with us to save time on your next checkout:",注册以放遍下次结账节省时间:
+"Sign up with us to save time on your next checkout:",注册以放遍下次结账节省时间：
 State/Province,州/省
 "Street Address",街道地址
 "Street Address %1","街道地址 %1"
diff --git a/app/code/Magento/ProductAlert/i18n/zh_CN.csv b/app/code/Magento/ProductAlert/i18n/zh_CN.csv
index cd3e5cfa5296..7c7d3be2c61a 100644
--- a/app/code/Magento/ProductAlert/i18n/zh_CN.csv
+++ b/app/code/Magento/ProductAlert/i18n/zh_CN.csv
@@ -1,6 +1,6 @@
 "Alert subscription has been saved.",提醒订阅已保存。
 "Click here not to receive alerts for this product.",单击这里不接收产品报警。
-"Invalid block type: %1","无效的快类型: %1"
+"Invalid block type: %1","无效的快类型： %1"
 Price:,价格：
 "Product Alerts",产品警报
 "Regular Price:",常规价格：
diff --git a/app/code/Magento/Rss/i18n/zh_CN.csv b/app/code/Magento/Rss/i18n/zh_CN.csv
index ff4fbd203387..7f9793b3f7c9 100644
--- a/app/code/Magento/Rss/i18n/zh_CN.csv
+++ b/app/code/Magento/Rss/i18n/zh_CN.csv
@@ -10,7 +10,7 @@ Catalog,分类
 "Comment: %1<br/>","评论：%1 <br/>"
 Coupons/Discounts,代金券/折扣
 "Current Status: %1<br/>","当前状态：%1 <br/>"
-"Customer Name: %1","客户名: %1"
+"Customer Name: %1","客户名： %1"
 "Details for %1 #%2","%1 #%2的详情"
 Discount,折扣
 "Discount (%1)","折扣 （%1）"
@@ -29,14 +29,14 @@ Message:,信息：
 "Order # %1 Notification(s)","订单# %1 通知（s）"
 "Order #%1 created at %2",订单#%1创建于%2
 "Pending product review(s)",未决的产品评论
-"Price: %1","价格: %1"
+"Price: %1","价格： %1"
 "Product: ""%1"" review By: %2","产品：“%1” 由 %2 评论"
 "Product: <a href=""%1"">%2</a> <br/>","产品：<a href=""%1"">%2</a> <br/>"
 "Purchased From: %1",购买自：%1
 "Review: %1 <br/>","评论：%1 <br/>"
 "Shipping &amp; Handling",运送与手续费
 "Special Expires On: %1",特价于%1过期
-"Special Price: %1","特价: %1"
+"Special Price: %1","特价： %1"
 "Special Products",特殊商品
 "Store: %1 <br/>","商店：%1 <br/>"
 Subtotal,小计
diff --git a/app/code/Magento/Sales/i18n/zh_CN.csv b/app/code/Magento/Sales/i18n/zh_CN.csv
index c3c7ae206afc..885b0555f46d 100644
--- a/app/code/Magento/Sales/i18n/zh_CN.csv
+++ b/app/code/Magento/Sales/i18n/zh_CN.csv
@@ -11,7 +11,7 @@
 "* - Enter custom price including tax","* - 输入含税的自定义价格"
 "-- Please Select --","-- 请选择 --"
 "-- Please Select Billing Agreement--","-- 请选择记账协议 --"
-"<span class=""label"">Order Date:</span> %1","<span class=""label"">订单日期:</span> %1"
+"<span class=""label"">Order Date:</span> %1","<span class=""label"">订单日期：</span> %1"
 "A PDF object is not specified.",未指定一个PDF对象。
 "A PDF page object is not specified.",未指定一个PDF页对象。
 "A hold action is not available.",挂起动作不可用。
@@ -59,13 +59,13 @@ Apply,应用
 "Are you sure you want to delete all items from shopping cart?",你是否确定要删除购物车中的所有内容？
 "Are you sure you want to deny this payment?",您确认要拒绝该支付吗？
 "Are you sure you want to do this?",您是否确认要这样做？
-"Are you sure you want to send a Credit memo email to customer?",您确定要发送一封付款通知邮件给客户吗?
-"Are you sure you want to send a Shipment email to customer?",您确定要发送一封运单邮件给客户吗?
-"Are you sure you want to send an Invoice email to customer?",您确定要发送一封发票邮件给客户吗?
-"Are you sure you want to send an order email to customer?",你确定要发送一封订单邮件给客户吗?
+"Are you sure you want to send a Credit memo email to customer?",您确定要发送一封付款通知邮件给客户吗？
+"Are you sure you want to send a Shipment email to customer?",您确定要发送一封运单邮件给客户吗？
+"Are you sure you want to send an Invoice email to customer?",您确定要发送一封发票邮件给客户吗？
+"Are you sure you want to send an order email to customer?",你确定要发送一封订单邮件给客户吗？
 "Are you sure you want to void the payment?",您确认要使支付无效吗？
 "Are you sure?",您是否确认？
-"Are you sure? This order will be canceled and a new one will be created instead.","你确定吗? 该订单将要被取消并重现创建一个。"
+"Are you sure? This order will be canceled and a new one will be created instead.","你确定吗？ 该订单将要被取消并重现创建一个。"
 "Assign Order Status to State",按国家分配订单状态
 "Assign Status to State",按国家分配状态
 "Assignment Information",分配信息
@@ -134,8 +134,8 @@ Create,创建
 "Create Packages",创建包
 "Create Shipment",创建运单
 "Create Shipping Label",创建运送标签
-"Create Shipping Label...",创建运送标签...
-Create...,创建...
+"Create Shipping Label...",创建运送标签。。。
+Create...,创建。。。
 Created,创建于
 "Created billing agreement #%1.","创建记账协议 #%1。"
 Created:,创建：
@@ -305,7 +305,7 @@ Order,订单
 "Order Date",订单日期
 "Order Date (%1)",订单日期（%1）
 "Order Date: ",订单日期：
-"Order Date: %1","订单日期: %1"
+"Order Date: %1","订单日期： %1"
 "Order Grand Total",订单总数
 "Order History",订单历史
 "Order ID","订单 ID"
@@ -340,7 +340,7 @@ Paid,已付费
 Partial,部分
 "Payment Information",支付信息
 "Payment Method",支付方式
-"Payment Method:",支付方法:
+"Payment Method:",支付方法：
 "Payment Review",支付预览
 "Payment transactions disallow storing objects.",支付交易不允许的店铺对象。
 "Payment type",支付类型
@@ -463,7 +463,7 @@ Select,选择
 Ship,送货
 "Ship Date",发货日期
 "Ship To",送货至
-"Ship to:",运送到:
+"Ship to:",运送到：
 "Ship-to Name",收货人
 Shipment,送货单号
 "Shipment #%1","运单 #%1"
@@ -492,7 +492,7 @@ Shipping,运送
 "Signed by",被签署
 Size,尺寸
 Sku,Sku
-"Sold to:",卖到:
+"Sold to:",卖到：
 "Some item options or their combination are not currently available.",一些条目选项或他们的组合当前无效。
 "Some items in this order are no longer in our catalog.",该订单的一些条目不在产品目录中。
 "Some of the products below do not have all the required options.",下面一些产品没有所有必须的选项。
@@ -580,7 +580,7 @@ Telephone,电话
 "This product does not have any configurable options",该产品不包含任何可配置选项
 "This product is disabled.",该产品被禁止。
 "This profile state cannot be changed to ""%1"".",该资料状态无法更改为“%1”。
-"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you want to continue?",这将创建一个离线退款。为了创建在线退款，打开一个发票然后为其创建付款通知。你确定要继续吗?
+"This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you want to continue?",这将创建一个离线退款。为了创建在线退款，打开一个发票然后为其创建付款通知。你确定要继续吗？
 "Tier Pricing",层级价格
 Title,标题
 To,发送至
@@ -614,7 +614,7 @@ Total,总数
 "Tracking Number(s):",追踪编号：
 "Tracking summary",追踪摘要
 "Transaction ID",交易ID
-"Transaction ID: ""%1""","交易ID: ""%1"""
+"Transaction ID: ""%1""","交易ID： ""%1"""
 "Transaction Type",交易类型
 Transactions,交易
 "Trial ",试用
@@ -694,7 +694,7 @@ Weight,高度
 Width,宽
 "Wish List",收藏清单
 Wishlist,收藏清单
-"Wrong state: ""%1""","错误状态: ""%1"""
+"Wrong state: ""%1""","错误状态： ""%1"""
 Yes,是
 "You are trying to add a quantity for some products that doesn't match the quantity that was shipped.",您正在尝试为一些不匹配运送数量的产品添加数量。
 "You can't do this without a transaction object.",没有交易对象不能进行该操作。
diff --git a/app/code/Magento/Sendfriend/i18n/zh_CN.csv b/app/code/Magento/Sendfriend/i18n/zh_CN.csv
index 63f8e10b2559..02e32e74043b 100644
--- a/app/code/Magento/Sendfriend/i18n/zh_CN.csv
+++ b/app/code/Magento/Sendfriend/i18n/zh_CN.csv
@@ -10,6 +10,7 @@ Enabled,已启用
 "Invalid Sender Email",无效的发送者邮件
 "Invalid Sender Information",无效的发送者信息
 "Maximum %1 email addresses allowed",最多允许%1个邮件地址
+"Maximum %1 email addresses allowed.",最多允许%1个邮件地址。
 Message:,信息：
 Name,姓名
 Name:,姓名：
@@ -29,4 +30,3 @@ Sender:,发送人：
 "We found some problems with the data.",发现数据有问题。
 "You can't send messages more than %1 times an hour.",您不能一小时内发送消息超过%1次。
 "You've met your limit of %1 sends in an hour.",您已经达到了每小时发送的限制数%1。
-"Maximum %1 email addresses allowed.","最多允许%1个邮件地址。"
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/i18n/zh_CN.csv b/app/code/Magento/Shipping/i18n/zh_CN.csv
index 00f9cbb52514..fc0829cea130 100644
--- a/app/code/Magento/Shipping/i18n/zh_CN.csv
+++ b/app/code/Magento/Shipping/i18n/zh_CN.csv
@@ -32,8 +32,8 @@ Percent,百分之
 "Please correct Country ""%1"" in the Row #%2.","请在行#%2纠正国家""%1""。"
 "Please correct Region/State ""%1"" in the Row #%2.","请在行#%2纠正地区/州""%1""。"
 "Please correct Shipping Price ""%1"" in the Row #%2.","请在行#%2纠正运送价格""%1""。"
-"Please correct Table Rate code for type %1: %2.","请纠正类型%1: %2的表费率代码。"
-"Please correct Table Rate code type: %1.","请纠正表费率代码类型: %1。"
+"Please correct Table Rate code for type %1: %2.","请纠正类型%1： %2的表费率代码。"
+"Please correct Table Rate code type: %1.","请纠正表费率代码类型： %1。"
 "Please correct Table Rates File Format.",请纠正货运费率表文件格式。
 "Please correct Table Rates format in the Row #%1.",请在行#%1纠正表费率格式。
 Price,价格
@@ -58,6 +58,7 @@ Title,标题
 Track:,追踪：
 "Tracking Information",追踪信息
 "Tracking Number:",追踪号码：
+"Tracking information is currently not available. Please ",追踪信息当前不可用。请
 "Tracking information is not available. Please ",无效的追踪信息
 "Tracking information is unavailable.",无效的追踪信息。
 Type,类型
@@ -69,4 +70,3 @@ Type,类型
 Weight:,重量：
 "contact us",联系我们
 "email us at ",发送电子邮件给我们：
-"Tracking information is currently not available. Please ","追踪信息当前不可用。请"
\ No newline at end of file
diff --git a/app/code/Magento/Tax/i18n/zh_CN.csv b/app/code/Magento/Tax/i18n/zh_CN.csv
index b865ce6d8529..c2eb37ca0cf2 100644
--- a/app/code/Magento/Tax/i18n/zh_CN.csv
+++ b/app/code/Magento/Tax/i18n/zh_CN.csv
@@ -15,8 +15,8 @@ Country,国家
 "Customer Tax Class",客户税务类型
 "Delete Rate",删除费率
 "Delete Rule",删除规则
-"Do you really want to delete this tax class?",你确定要删除该税类吗?
-"Do you really want to delete this tax rate?",你真的要删除该税率吗?
+"Do you really want to delete this tax class?",你确定要删除该税类吗？
+"Do you really want to delete this tax rate?",你真的要删除该税率吗？
 "Edit Rule",修改规则
 "Edit Tax Rate",编辑税率
 "Excel XML","Excel XML"
diff --git a/app/code/Magento/Theme/i18n/zh_CN.csv b/app/code/Magento/Theme/i18n/zh_CN.csv
index 5acc4370c78f..2bd5d1fafa12 100644
--- a/app/code/Magento/Theme/i18n/zh_CN.csv
+++ b/app/code/Magento/Theme/i18n/zh_CN.csv
@@ -1,9 +1,9 @@
 "Add New Theme",添加新的主题
 "Allowed file types *.css.",允许的文件类型*。css。
 "Allowed file types *.js.",允许的文件类型*。js。
-"Are you sure you want to delete this file?",你确定要删除该文件吗?
-"Are you sure you want to delete this folder?",你确定要删除该目录吗?
-"Are you sure you want to delete this theme?",你确定要删除该主题吗?
+"Are you sure you want to delete this file?",你确定要删除该文件吗？
+"Are you sure you want to delete this folder?",你确定要删除该目录吗？
+"Are you sure you want to delete this theme?",你确定要删除该主题吗？
 "Browse Files",浏览文件
 "CSS Editor",CSS编辑器
 "Copy of %1",%1副本
@@ -11,7 +11,7 @@
 "Custom CSS",定制CSS
 "Download CSS File",下载CSS文件
 "Edit custom.css",编辑custom。css
-"Example: 0.0.0.1 or 123.1.0.25-alpha1","例: 0。0。0。1或123。1。0。25-alpha1"
+"Example: 0.0.0.1 or 123.1.0.25-alpha1","例： 0。0。0。1或123。1。0。25-alpha1"
 "JS Editor",JS编辑器
 "Max file size to upload %1M",上传文件的最大尺寸%1M
 "Max image size %1M",最大图片尺寸%1M
@@ -30,7 +30,7 @@ Theme,主题
 "Theme Title",主题标题
 "Theme Version",主题版本
 "Theme isn't editable.",主题不可编辑。
-"Theme: %1","主题: %1"
+"Theme: %1","主题： %1"
 "This file will replace the current custom.css file and can't be more than 2 MB.",该文件将替换当前custom。css文件并且大小不能超过2MB。
 "Upload CSS File",上传CSS文件
 "Upload Fonts",上传字体
diff --git a/app/code/Magento/Usa/i18n/zh_CN.csv b/app/code/Magento/Usa/i18n/zh_CN.csv
index f2a9b3dfd1ad..77250ae672cc 100644
--- a/app/code/Magento/Usa/i18n/zh_CN.csv
+++ b/app/code/Magento/Usa/i18n/zh_CN.csv
@@ -38,16 +38,16 @@ Documents,文档
 "Easy shop",轻松购物
 "Economy select",选择经济的
 "Empty response",无需应答
-"Error #%1 : %2","错误 #%1 : %2"
-"Error #%1 : %2 (%3)","错误 #%1 : %2 （%3）"
-"Error #%1: %2","错误 #%1: %2"
+"Error #%1 : %2","错误 #%1 ： %2"
+"Error #%1 : %2 (%3)","错误 #%1 ： %2 （%3）"
+"Error #%1: %2","错误 #%1： %2"
 Europack,欧洲
 "Europe First Priority",欧洲优先
 Express,快速
-"Express 10:30","快速 10:30"
-"Express 10:30 AM",快速早10:30
-"Express 12:00","快速 12:00"
-"Express 9:00","快速 9:00"
+"Express 10:30","快速 10：30"
+"Express 10:30 AM",快速早10：30
+"Express 12:00","快速 12：00"
+"Express 9:00","快速 9：00"
 "Express Mail",快速邮件
 "Express Saturday",快速周六
 "Express Saver",快速经济
diff --git a/app/code/Magento/User/i18n/zh_CN.csv b/app/code/Magento/User/i18n/zh_CN.csv
index 66e9e855636f..3b4e3bc0cacb 100644
--- a/app/code/Magento/User/i18n/zh_CN.csv
+++ b/app/code/Magento/User/i18n/zh_CN.csv
@@ -6,13 +6,13 @@
 "Magento Admin Panel",Magento管理面板
 "Password is required field.",密码是必输项。
 "Please correct the password reset token.",请纠正密码重置口令。
-"Please correct this email address:",请纠正邮件地址:
+"Please correct this email address:",请纠正邮件地址：
 "Please specify the correct account and try again.",请指定正确的账户名重试。
 Role,角色
 "This role no longer exists.",该角色不存在。
 "User Name is a required field.",用户名是必输项。
-"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","警告!\r\n该操作将从已经分配角色中移除这个用户\r\n您确定?"
-"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","警告!\r\n该操作将从已经分配角色中移除那些用户\r\n您确定?"
+"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","警告!\r\n该操作将从已经分配角色中移除这个用户\r\n您确定？"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","警告!\r\n该操作将从已经分配角色中移除那些用户\r\n您确定？"
 "We can't find a user to delete.",找不到要删除的用户。
 "You cannot delete self-assigned roles.",不能删除自分配的角色。
 "You deleted the role.",成功删除了角色。
diff --git a/app/code/Magento/Webapi/i18n/zh_CN.csv b/app/code/Magento/Webapi/i18n/zh_CN.csv
index 256d88dc23f0..100ab3c38171 100644
--- a/app/code/Magento/Webapi/i18n/zh_CN.csv
+++ b/app/code/Magento/Webapi/i18n/zh_CN.csv
@@ -8,18 +8,18 @@
 "Content-Type header is empty.",空的Content-Type头。
 "Content-Type header is invalid.",无效的Content-Type头。
 "Decoding error.",解码错误。
-"Decoding error: %1%2%3%4","解码错误: %1%2%3%4"
+"Decoding error: %1%2%3%4","解码错误： %1%2%3%4"
 "Delete API Role",删除API角色
 "Delete API User",删除API用户
 "Edit API Role",编辑API角色
 "Incorrect format of WSDL request URI or Requested services are missing.",WSDL请求不正确或者请求的服务不存在。
-"Internal Error. Details are available in Magento log file. Report ID: %1","内不错误。详细信息请查看Magento日志文件。 报告ID: %1"
+"Internal Error. Details are available in Magento log file. Report ID: %1","内不错误。详细信息请查看Magento日志文件。 报告ID： %1"
 "Invalid XML",无效的XML
-"Invalid XML: Detected use of illegal DOCTYPE","无效的XML: 检测到不合法的DOCTYPE"
+"Invalid XML: Detected use of illegal DOCTYPE","无效的XML： 检测到不合法的DOCTYPE"
 "Magento is not yet installed",还没有安装Magento
 "New API Role",新的API角色
 "New API User",新的API用户
-"Not allowed parameters: %1. Please use only %2 and %3.","不允许的参数: %1。 请仅使用%2和%3。"
+"Not allowed parameters: %1. Please use only %2 and %3.","不允许的参数： %1。 请仅使用%2和%3。"
 "Operation ""%1"" not found.","操作""%1""没发现。"
 "Operation allowed only in HTTPS",仅允许HTTPS
 "Request does not match any route.",请求不匹配任何路由。
@@ -38,5 +38,5 @@
 "This role no longer exists.",该角色不存在。
 "UTF-8 is the only supported charset.",仅支持UTF-8编码。
 "Unable to find a user to be deleted.",找不到要删除的用户。
-"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","警告！\r\n该操作将移那些除已经分配角色的用户\r\n你确定吗?"
+"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","警告！\r\n该操作将移那些除已经分配角色的用户\r\n你确定吗？"
 "Web Api","Web Api"
diff --git a/app/code/Magento/Webhook/i18n/zh_CN.csv b/app/code/Magento/Webhook/i18n/zh_CN.csv
index 7aeba899aadd..7c0561034b52 100644
--- a/app/code/Magento/Webhook/i18n/zh_CN.csv
+++ b/app/code/Magento/Webhook/i18n/zh_CN.csv
@@ -18,8 +18,8 @@ Subscription,订阅
 "Subscription registration failed!",订阅注册失败!
 "Subscription registration succeeded.",成功注册订阅。
 Subscriptions,订阅
-"The <em>%1</em> subscription is requesting permissions to the following:",订阅<em>%1</em>正在请求下面的权限:
-"The following topics are not authorized: %1","下面的话题没有被授权: %1"
+"The <em>%1</em> subscription is requesting permissions to the following:",订阅<em>%1</em>正在请求下面的权限：
+"The following topics are not authorized: %1","下面的话题没有被授权： %1"
 "The subscription '%1' can not be removed.",订阅'%1'不能被移除。
 "The subscription '%1' has been activated.",订阅'%1'不能被激活。
 "The subscription '%1' has been removed.",订阅'%1'已经被被移除。
diff --git a/app/code/Magento/Widget/i18n/zh_CN.csv b/app/code/Magento/Widget/i18n/zh_CN.csv
index 8fa879df126a..02e143d0976d 100644
--- a/app/code/Magento/Widget/i18n/zh_CN.csv
+++ b/app/code/Magento/Widget/i18n/zh_CN.csv
@@ -12,7 +12,7 @@ Apply,应用
 "Big Image",大图片
 CMS,内容管理系统（CMS）
 Categories,分类
-Choose...,选择...
+Choose...,选择。。。
 Close,关闭
 Continue,继续
 Delete,删除
@@ -24,7 +24,7 @@ Delete,删除
 "Generic Pages",通用页面
 Images,图像
 "Insert Widget",插入小工具
-"Insert Widget...",插入小工具...
+"Insert Widget...",插入小工具。。。
 "Layout Updates",布局更新
 "Manage Widget Instances",管理小工具实例
 "New Frontend App Instance",新的前端应用实例
diff --git a/app/code/Magento/Wishlist/i18n/zh_CN.csv b/app/code/Magento/Wishlist/i18n/zh_CN.csv
index aaf4fc8a7353..76d5b454b9ec 100644
--- a/app/code/Magento/Wishlist/i18n/zh_CN.csv
+++ b/app/code/Magento/Wishlist/i18n/zh_CN.csv
@@ -1,7 +1,7 @@
 "%1 for ""%2"".","%1 为 ""%2""。"
 "%1 has been added to your wishlist. Click <a href=""%2"">here</a> to continue shopping.","%1已经被加入到你的收藏夹。单击<a href=""%2"">这里</a>继续购物。"
 "%1 has been updated in your wish list.",收藏清单里%1已经被更新。
-"%1 product(s) have been added to shopping cart: %2.","%1个产品已经被添加到购物车: %2。"
+"%1 product(s) have been added to shopping cart: %2.","%1个产品已经被添加到购物车： %2。"
 "%1's Wishlist","%1 的收藏清单"
 "* Required Fields",*必要字段
 "Add All to Cart",全部添加到购物车
@@ -15,7 +15,8 @@
 "An error occurred while deleting the item from wish list.",当从收藏清单删除该条目是出错。
 "An error occurred while deleting the item from wish list: %1",当从收藏清单中删除条目%1时发生错误
 "An error occurred while updating wish list.",当更新收藏清单时发生错误。
-"Are you sure you want to remove this product from your wish list?",您确定要从收藏清单里移除该产品吗?
+"Are you sure you want to remove this product from your wish list?",您确定要从收藏清单里移除该产品吗？
+"Are you sure you want to remove this product from your wishlist?",您确定要从收藏清单里移除该产品吗？
 "Are you sure you would like to remove this item from the wishlist?",您确认要从收藏清单中删除该条目？
 Back,返回
 "Can't delete item from wishlist",无法从收藏清单中删除条目
@@ -31,6 +32,7 @@ Comment:,评论：
 "Display number of items in wish list",显示收藏清单里的条目数量
 Edit,编辑
 "Email address can't be empty.",邮件地址不能为空。
+"Email addresses, separated by commas",用逗号分隔邮件地址
 "Email addresses, separated by commas (max %1 addresses)",用逗号分隔的邮件地址（最多%1个地址）
 Enabled,已启用
 "Go to Wish List",去我的收藏
@@ -53,12 +55,14 @@ Product,产品
 "Remove This Item",删除该内容
 "Remove item",删除条目
 "Share Wish List",分享收藏
+"Share Wishlist",分享清单
 "Share Your Wish List",分享你的收藏
 "Sharing Information",分享信息
 "This Wish List has no Items",收藏清单没有任何条目
 "This product(s) is out of stock.",该产品缺货。
 "This wishlist can be shared %1 more times.",该收藏清单能被分享%1甚至更多次。
 "Update Wish List",更新收藏清单
+"Update Wishlist",更新收藏
 "View Details",查看详情
 "View Product",查看产品
 "We can't configure the product.",不能配置该产品。
@@ -69,7 +73,7 @@ Product,产品
 "We can't specify a wish list.",没有指定收藏清单。
 "We can't update wish list.",不能更新收藏清单。
 "We cannot add this item to your shopping cart.",不能添加该条目到购物车。
-"We couldn't add the following product(s) to the shopping cart: %1.","无法添加下面的产品到购物车: %1。"
+"We couldn't add the following product(s) to the shopping cart: %1.","无法添加下面的产品到购物车： %1。"
 "What's this?",这是什么？
 "Wish List",收藏清单
 "Wish List Sharing",收藏分享
@@ -79,7 +83,3 @@ Wishlist,收藏清单
 "You have no items in your wish list.",你的收藏没有任何条目
 "You have no items in your wishlist.",您的收藏清单是空的。
 "Your wish list has been shared.",您的收藏清单已经被分享。
-"Are you sure you want to remove this product from your wishlist?","您确定要从收藏清单里移除该产品吗？"
-"Email addresses, separated by commas","用逗号分隔邮件地址"
-"Share Wishlist","分享清单"
-"Update Wishlist","更新收藏"