diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php
index 2369419e4..b49778e57 100644
--- a/dictionaries/zh.dictionary.itop.ui.php
+++ b/dictionaries/zh.dictionary.itop.ui.php
@@ -123,10 +123,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:User/Attribute:login+' => '用户标识字符串',
 	'Class:User/Attribute:language' => '语言',
 	'Class:User/Attribute:language+' => '用户语言',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:language/Value:EN US' => '英语',
+	'Class:User/Attribute:language/Value:EN US+' => '英语 (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => '法语',
+	'Class:User/Attribute:language/Value:FR FR+' => '法语 (France)',
 	'Class:User/Attribute:profile_list' => '角色',
 	'Class:User/Attribute:profile_list+' => '授予该用户的角色',
 	'Class:User/Attribute:allowed_org_list' => '可访问的组织',
@@ -230,7 +230,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:URP_ProfileProjection/Attribute:profile' => '角色',
 	'Class:URP_ProfileProjection/Attribute:profile+' => '角色名称',
 	'Class:URP_ProfileProjection/Attribute:value' => '值表达式',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant |  | +attribute code',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL 表达式 (using $user) | constant |  | +attribute code',
 	'Class:URP_ProfileProjection/Attribute:attribute' => '属性',
 	'Class:URP_ProfileProjection/Attribute:attribute+' => '目标属性编码 (可选)',
 ));
@@ -249,7 +249,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:URP_ClassProjection/Attribute:class' => '类',
 	'Class:URP_ClassProjection/Attribute:class+' => '目标类',
 	'Class:URP_ClassProjection/Attribute:value' => '值表达式',
-	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant |  | +attribute code',
+	'Class:URP_ClassProjection/Attribute:value+' => 'OQL 表达式 (using $this) | constant |  | +attribute code',
 	'Class:URP_ClassProjection/Attribute:attribute' => '属性',
 	'Class:URP_ClassProjection/Attribute:attribute+' => '目标属性编码 (可选)',
 ));
@@ -391,7 +391,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Button:SimulateImport' => ' 开始导入 ',
 	'UI:Button:Test' => '测试!',
 	'UI:Button:Evaluate' => ' 测试 ',
-	'UI:Button:Evaluate:Title' => ' Evaluate (Ctrl+Enter)',
+	'UI:Button:Evaluate:Title' => ' 评估 (Ctrl+Enter)',
 	'UI:Button:AddObject' => ' 添加... ',
 	'UI:Button:BrowseObjects' => ' 浏览... ',
 	'UI:Button:Add' => ' 添加 ',
@@ -404,8 +404,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Button:ChangePassword' => ' 修改密码 ',
 	'UI:Button:ResetPassword' => ' 重置密码 ',
 	'UI:Button:Insert' => '插入',
-	'UI:Button:More' => 'More',
-	'UI:Button:Less' => 'Less',
+	'UI:Button:More' => '更多',
+	'UI:Button:Less' => '更少',
 
 	'UI:SearchToggle' => '搜索',
 	'UI:ClickToCreateNew' => '新建 %1$s',
@@ -461,11 +461,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:History:Changes' => '变更',
 	'UI:History:Changes+' => '对该对象所做的变更',
 	'UI:History:StatsCreations' => '已创建',
-	'UI:History:StatsCreations+' => 'Count of objects created',
+	'UI:History:StatsCreations+' => '已创建的对象个数',
 	'UI:History:StatsModifs' => '已修改',
-	'UI:History:StatsModifs+' => 'Count of objects modified',
+	'UI:History:StatsModifs+' => '已修改的对象个数',
 	'UI:History:StatsDeletes' => '已删除',
-	'UI:History:StatsDeletes+' => 'Count of objects deleted',
+	'UI:History:StatsDeletes+' => '已删除的对象个数',
 	'UI:Loading' => '载入...',
 	'UI:Menu:Actions' => '操作',
 	'UI:Menu:OtherActions' => '其他操作',
@@ -488,7 +488,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:ChangesLogTitle' => '变更记录 (%1$d):',
 	'UI:EmptyChangesLogTitle' => '变更记录为空',
 	'UI:SearchFor_Class_Objects' => '搜索 %1$s ',
-	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryBuilderTitle' => 'OQL 查询构建器',
 	'UI:OQLQueryTab' => 'OQL 查询',
 	'UI:SimpleSearchTab' => '简单搜索',
 	'UI:Details+' => '详情',
@@ -537,8 +537,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:LogOff:ClickHereToLoginAgain' => '点击这里再次登录...',
 	'UI:ChangePwdMenu' => '修改密码...',
 	'UI:Login:PasswordChanged' => '密码已成功设置!',
-	'UI:AccessRO-All' => 'iTop is read-only',
-	'UI:AccessRO-Users' => 'iTop is read-only for end-users',
+	'UI:AccessRO-All' => 'iTop 是只读的',
+	'UI:AccessRO-Users' => 'iTop 对于终端用户是只读的',
 	'UI:ApplicationEnvironment' => '应用环境: %1$s',
 	'UI:Login:RetypePwdDoesNotMatch' => '新密码输入不一致!',
 	'UI:Button:Login' => '登录iTop',
@@ -612,7 +612,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CSVReport-Value-ChangeIssue' => '无法修改成 %1$s - 原因: %2$s',
 	'UI:CSVReport-Value-NoMatch' => '不匹配',
 	'UI:CSVReport-Value-Missing' => '缺少必填项',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects',
+	'UI:CSVReport-Value-Ambiguous' => '模糊匹配: 找到 %1$s 个对象',
 	'UI:CSVReport-Row-Unchanged' => '保持不变',
 	'UI:CSVReport-Row-Created' => '新建',
 	'UI:CSVReport-Row-Updated' => '已更新 %1$d 列',
@@ -623,7 +623,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CSVReport-Value-Issue-FoundMany' => '找到 %1$d 个匹配项',
 	'UI:CSVReport-Value-Issue-Readonly' => '\'%1$s\' 的属性是只读的,不能修改 (当前值: %2$s, 建议值: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => '输入处理失败: %1$s',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': 无法匹配, 请检查拼写',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => '属性不一致: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => '错误的属性',
@@ -716,8 +716,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:LifeCycle' => '生命周期',
 	'UI:Schema:Triggers' => '触发器',
 	'UI:Schema:Relation_Code_Description' => '关联 <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
+	'UI:Schema:RelationDown_Description' => '向下: %1$s',
+	'UI:Schema:RelationUp_Description' => '向上: %1$s',
 	'UI:Schema:RelationPropagates' => '%1$s: 繁殖到 %2$d 个层级, 查询: %3$s',
 	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 没有繁殖 (%2$d 层级), 查询: %3$s',
 	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s 被类 %2$s 参照, 通过栏目 %3$s',
@@ -734,11 +734,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:LifeCycleAttributeMustChange' => '必须变更',
 	'UI:Schema:LifeCycleAttributeMustPrompt' => '用户将被提示改变值',
 	'UI:Schema:LifeCycleEmptyList' => '空列表',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => '显示:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:ClassFilter' => '类别:',
+	'UI:Schema:DisplayLabel' => '显示:',
+	'UI:Schema:DisplaySelector/LabelAndCode' => '标记和代码',
+	'UI:Schema:DisplaySelector/Label' => '标记',
+	'UI:Schema:DisplaySelector/Code' => '代码',
 	'UI:Schema:Attribute/Filter' => '过滤器~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => '输入前3个字符...',
@@ -1080,7 +1080,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:BulkModifyStatus' => '操作',
 	'UI:BulkModifyStatus+' => '操作状态',
 	'UI:BulkModifyErrors' => 'Errors (if any)',
-	'UI:BulkModifyErrors+' => 'Errors preventing the modification',
+	'UI:BulkModifyErrors+' => '阻止修改时报错',
 	'UI:BulkModifyStatusOk' => 'Ok',
 	'UI:BulkModifyStatusError' => '错误',
 	'UI:BulkModifyStatusModified' => '已修改',
@@ -1143,8 +1143,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Button:MoveUp' => '上移',
 	'UI:Button:MoveDown' => '下移',
 
-	'UI:OQL:UnknownClassAndFix' => '未知 class "%1$s". You may try "%2$s" instead.',
-	'UI:OQL:UnknownClassNoFix' => '未知 class "%1$s"',
+	'UI:OQL:UnknownClassAndFix' => '未知类别 "%1$s". 您可以试试 "%2$s" .',
+	'UI:OQL:UnknownClassNoFix' => '未知类别 "%1$s"',
 
 	'UI:Dashboard:Edit' => '编辑这个页面...',
 	'UI:Dashboard:Revert' => '还原到初始版本...',
@@ -1184,7 +1184,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Proxy dashlet',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").',
-	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (显示为纯 XML)',
+	'UI:DashletProxy:Prop-XMLConfiguration' => '配置 (显示为纯 XML)',
 
 	'UI:DashletPlainText:Label' => '文本',
 	'UI:DashletPlainText:Description' => '纯文本(无格式)',
@@ -1311,7 +1311,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Shortcut' => '快捷方式',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => '名称',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title',
+	'Class:Shortcut/Attribute:name+' => '用于菜单和页面的标记',
 	'Class:ShortcutOQL' => '搜索结果的快捷方式',
 	'Class:ShortcutOQL+' => '',
 	'Class:ShortcutOQL/Attribute:oql' => '查询',
@@ -1365,7 +1365,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:About:InstallationOptions' => '已安装的模块',
 	'UI:About:ManualExtensionSource' => '扩展',
 	'UI:About:Extension_Version' => '版本: %1$s',
-	'UI:About:RemoteExtensionSource' => 'Data',	
+	'UI:About:RemoteExtensionSource' => '数据',	
 
 	'UI:DisconnectedDlgMessage' => '您已断开. 要继续使用，需要重新验证您的用户名和密码.',
 	'UI:DisconnectedDlgTitle' => '警告!',
@@ -1386,11 +1386,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'portal:backoffice' => 'iTop 后台用户界面',
 
 	'UI:CurrentObjectIsLockedBy_User' => '对象被锁住,因为正在修改 %1$s.',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => '该对象正在被 %1$s 修改. 您的修改无法提交因为它们会冲突.',
+	'UI:CurrentObjectLockExpired' => '并发修改的锁定期已过.',
 	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !',
+	'UI:ConcurrentLockKilled' => '阻止并发修改当前对象的锁已被删除.',
+	'UI:Menu:KillConcurrentLock' => '消除并发修改锁定!',
 
 	'UI:Menu:ExportPDF' => '导出 PDF...',
 	'UI:Menu:PrintableVersion' => '打印',
@@ -1408,7 +1408,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 	// Search form
 	'UI:Search:Toggle' => '折叠 / 展开',
-	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class',
+	'UI:Search:AutoSubmit:DisabledHint' => '该类别已禁用自动提交',
+	'UI:Search:NoAutoSubmit:ExplainText' => '在搜索框中添加规则，或者单击对象按钮查看对象.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => '添加条件',
 	// - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => '最近使用',
@@ -1419,8 +1420,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// - Criteria titles
 	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: 任何',
-	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
-	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
+	'UI:Search:Criteria:Title:Default:Empty' => '%1$s 为空',
+	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s 不为空',
 	'UI:Search:Criteria:Title:Default:Equals' => '%1$s 等于 %2$s',
 	'UI:Search:Criteria:Title:Default:Contains' => '%1$s 包含 %2$s',
 	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s 起始于 %2$s',
@@ -1445,22 +1446,22 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
 	//   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s 和 %3$s others',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: 任何',
     //   - External key widget
     'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s 已定义',
     'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s 未被定义',
     'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
     'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others',
+    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s 和 %3$s others',
     'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: 任何',
     //   - Hierarchical key widget
     'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s 已定义',
     'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s 未被定义',
     'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
     'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any',
+    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s 和 %3$s others',
+    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: 任何',
 
 	// - Criteria operators
 	//   - Default widget
@@ -1484,7 +1485,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// - Other translations
 	'UI:Search:Value:Filter:Placeholder' => '过滤器...',
 	'UI:Search:Value:Search:Placeholder' => '搜索...',
-	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.',
+	'UI:Search:Value:Autocomplete:StartTyping' => '开始输入值.',
 	'UI:Search:Value:Autocomplete:Wait' => '请稍后...',
 	'UI:Search:Value:Autocomplete:NoResult' => '没有找到结果.',
 	'UI:Search:Value:Toggler:CheckAllNone' => '全选 / 不选',