improved chinese translations

1 improved chinese translations 2 fix some missing enries 3 correct line number against english language
2026-02-13 07:24:13 +01:00 · 2020-01-05 19:16:47 +08:00
parent 46c239c211
commit 97ebffd5fb
24 changed files with 191 additions and 141 deletions
--- a/datamodels/2.x/authent-cas/zh_cn.dict.authent-cas.php
+++ b/datamodels/2.x/authent-cas/zh_cn.dict.authent-cas.php
@@ -7,7 +7,7 @@
 */

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'CAS:Error:UserNotAllowed' => 'User not allowed~~',
-	'CAS:Login:SignIn' => 'Sign in with CAS~~',
-	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
+	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
+	'CAS:Login:SignIn' => '使用CAS 登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用CAS 服务器认证',
 ));
--- a/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
@@ -30,25 +30,27 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: UserLocal
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal' => 'iTop 用户',
 	'Class:UserLocal+' => '用户由 iTop 验证身份',
 	'Class:UserLocal/Attribute:password' => '密码',
 	'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',

-	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
-	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Never expire~~',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
-	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
-	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+	'Class:UserLocal/Attribute:expiration' => '密码过期',
+	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要一个扩展才能生效)',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire' => '已过期',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
+	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',

-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8 个字符,包含大小写、数字和特殊字符.',
 ));
--- a/datamodels/2.x/combodo-db-tools/zh_cn.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/zh_cn.dict.combodo-db-tools.php
@@ -20,44 +20,45 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Database inconsistencies
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'Menu:DBToolsMenu' => 'DB 工具',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
-	'DBTools:ErrorsFound' => 'Errors Found~~',
-	'DBTools:Error' => 'Error~~',
-	'DBTools:Count' => 'Count~~',
-	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:Title' => '数据库维护工具',
+	'DBTools:ErrorsFound' => '发现错误',
+	'DBTools:Error' => '错误',
+	'DBTools:Count' => '个数',
+	'DBTools:SQLquery' => 'SQL 查询',
 	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
-	'DBTools:SQLresult' => 'SQL result~~',
-	'DBTools:NoError' => 'The database is OK~~',
-	'DBTools:HideIds' => 'Error List~~',
-	'DBTools:ShowIds' => 'Detailed view~~',
-	'DBTools:ShowReport' => 'Report~~',
-	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:SQLresult' => 'SQL 结果',
+	'DBTools:NoError' => '数据库OK ',
+	'DBTools:HideIds' => '错误列表',
+	'DBTools:ShowIds' => '详细视图',
+	'DBTools:ShowReport' => '报告',
+	'DBTools:IntegrityCheck' => '完整性检查',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',

-	'DBTools:Analyze' => 'Analyze~~',
-	'DBTools:Details' => 'Show Details~~',
-	'DBTools:ShowAll' => 'Show All Errors~~',
+	'DBTools:Analyze' => '分析',
+	'DBTools:Details' => '显示详情',
+	'DBTools:ShowAll' => '显示所有错误',

-	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+	'DBTools:Inconsistencies' => '数据库不一致',

 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
-	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
-	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
-	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => '无效的外键 %1$s (列: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => '外键丢失 %1$s (列: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => '无效的值 %1$s (列: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
 	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
 ));

 // Database Info
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:DatabaseInfo' => '数据库信息',
 	'DBTools:Base' => 'Base~~',
-	'DBTools:Size' => 'Size~~',
+	'DBTools:Size' => '大小',
 ));

 // Lost attachments
@@ -65,21 +66,21 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',

-	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
-	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
-	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
-	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+	'DBTools:LostAttachments:Button:Analyze' => '分析',
+	'DBTools:LostAttachments:Button:Restore' => '还原',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => '该操作无法回退, 请确认是否继续还原.',
+	'DBTools:LostAttachments:Button:Busy' => '请稍后...',

 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',

-	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults' => '分析结果:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
-	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
-	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
-	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => '文件名',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => '当前位置',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => '移动到...',

-	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults' => '还原结果:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',

 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
--- a/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:TabTitle_Count' => '附件 (%1$d)',
 	'Attachments:EmptyTabTitle' => '附件',
@@ -34,7 +35,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachment:Max_Ko' => '(最大文件尺寸: %1$s KB)',
 	'Attachments:NoAttachment' => '没有附件. ',
 	'Attachments:PreviewNotAvailable' => '该附件类型不支持预览.',
-	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+	'Attachments:Error:FileTooLarge' => '上传的文件过大. %1$s~~',
+	'Attachments:Render:Icons' => '显示为图标',
+	'Attachments:Render:Table' => '显示为列表',
 ));

 //
@@ -42,18 +45,28 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Attachment' => 'Attachment~~',
-	'Class:Attachment+' => '~~',
-	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment' => '附件',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => '过期',
 	'Class:Attachment/Attribute:expire+' => '~~',
-	'Class:Attachment/Attribute:temp_id' => 'Temporary id~~',
+	'Class:Attachment/Attribute:temp_id' => '临时 id',
 	'Class:Attachment/Attribute:temp_id+' => '~~',
 	'Class:Attachment/Attribute:item_class' => 'Item class~~',
 	'Class:Attachment/Attribute:item_class+' => '~~',
 	'Class:Attachment/Attribute:item_id' => 'Item~~',
 	'Class:Attachment/Attribute:item_id+' => '~~',
 	'Class:Attachment/Attribute:item_org_id' => 'Item organization~~',
-	'Class:Attachment/Attribute:item_org_id+' => '~~',
-	'Class:Attachment/Attribute:contents' => 'Contents~~',
-	'Class:Attachment/Attribute:contents+' => '~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => '内容',
+	'Class:Attachment/Attribute:contents+' => '',
 ));
+
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Attachments:File:Thumbnail' => '图标',
+	'Attachments:File:Name' => '文件名',
+	'Attachments:File:Date' => '上传日期',
+	'Attachments:File:Creator' => '上传者',
+	'Attachments:File:Size' => '大小',
+	'Attachments:File:MimeType' => '类型',
+));
--- a/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(

 	'bkp-backup-running' => '备份正在进行,请稍后...',
--- a/datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ChangeManagement' => '变更管理',
 	'Menu:Change:Overview' => '概况',
--- a/datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ChangeManagement' => '变更管理',
 	'Menu:Change:Overview' => '概况',
--- a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
@@ -20,10 +20,12 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 //////////////////////////////////////////////////////////////////////
 // Relations
 //////////////////////////////////////////////////////////////////////
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Relation:impacts/Description' => '被影响的元素',
 	'Relation:impacts/DownStream' => '影响...',
@@ -1599,7 +1601,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => '设备名称',
 	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLAN',
 	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
 ));

--- a/datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(

 	'Menu:ConfigEditor' => '编辑配置文件',
@@ -28,7 +29,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'config-apply' => '应用',
 	'config-apply-title' => '应用 (Ctrl+S)',
 	'config-cancel' => '重置',
-	'config-saved' => '成功保存.',
+	'config-saved' => '保存成功.',
 	'config-confirm-cancel' => '您的修改将被丢弃.',
 	'config-no-change' => '没有变化: 配置文件将保持不变.',
 	'config-reverted' => '配置文件已恢复.',
--- a/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
@@ -22,87 +22,87 @@
 */

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'iTopUpdate:UI:PageTitle' => '应用升级',
+    'itop-core-update:UI:SelectUpdateFile' => '应用升级',
+    'itop-core-update:UI:ConfirmUpdate' => ' 升级',
    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
    'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',

-	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
-	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
-	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
-	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
-	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:SelectUpdateFile' => '请选择要上传的升级文件',
+	'iTopUpdate:UI:CheckUpdate' => '校验升级文件',
+	'iTopUpdate:UI:ConfirmInstallFile' => '即将安装 %1$s',
+	'iTopUpdate:UI:DoUpdate' => '升级',
+	'iTopUpdate:UI:CurrentVersion' => '当前已安装的版本',
+    'iTopUpdate:UI:Back' => '返回',
+    'iTopUpdate:UI:Cancel' => '取消',
+    'iTopUpdate:UI:Continue' => '继续',
+    'iTopUpdate:UI:WithDBBackup' => '数据库备份',
+    'iTopUpdate:UI:WithFilesBackup' => '应用文件备份',
    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
-	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
+    'iTopUpdate:UI:Backup' => '升级之前执行备份',
+	'iTopUpdate:UI:DoFilesArchive' => '打包应用文件',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',

-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+    'iTopUpdate:UI:Status' => '状态',
+    'iTopUpdate:UI:Action' => '升级',
+    'iTopUpdate:UI:History' => '版本历史',
+    'iTopUpdate:UI:Progress' => '升级进度',

-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+    'iTopUpdate:UI:DoBackup:Label' => '备份文件和数据库',
+    'iTopUpdate:UI:DoBackup:Warning' => '由于磁盘空间不足, 不建议备份',

-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => 'iTop disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
-	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
+    'iTopUpdate:UI:DiskFreeSpace' => '磁盘剩余空间',
+    'iTopUpdate:UI:ItopDiskSpace' => 'iTop 的磁盘空间',
+    'iTopUpdate:UI:DBDiskSpace' => '数据库的磁盘空间',
+	'iTopUpdate:UI:FileUploadMaxSize' => '文件上传大小上限',

-	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
-	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
+	'iTopUpdate:UI:PostMaxSize' => 'PHP ini 值 post_max_size: %1$s',
+	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini 值 upload_max_filesize: %1$s',

-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
-    'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
+    'iTopUpdate:UI:CanCoreUpdate:Loading' => '正在文件系统',
+    'iTopUpdate:UI:CanCoreUpdate:Error' => '文件系统检查失败 (%1$s)',
+    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => '文件系统检查失败 ( %1$s 文件不存在)',
+    'iTopUpdate:UI:CanCoreUpdate:Failed' => '文件系统检查失败',
+    'iTopUpdate:UI:CanCoreUpdate:Yes' => '应用无法升级',
+    'iTopUpdate:UI:CanCoreUpdate:No' => '应用无法升级: %1$s',

 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
-	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
-	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
-	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
-    'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
-	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+    'iTopUpdate:UI:SetupMessage:Ready' => '准备开始',
+	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => '正在进入维护模式',
+	'iTopUpdate:UI:SetupMessage:Backup' => '数据库备份',
+	'iTopUpdate:UI:SetupMessage:FilesArchive' => '打包应用文件',
+    'iTopUpdate:UI:SetupMessage:CopyFiles' => '复制新文件',
+    'iTopUpdate:UI:SetupMessage:Compile' => '升级应用程序和数据库',
+	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => '正在退出维护模式',
+    'iTopUpdate:UI:SetupMessage:UpdateDone' => '升级完成',

 	// Errors
-	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
-	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
-	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
-	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
-	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
-	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
-	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
+	'iTopUpdate:Error:MissingFunction' => '无法开始升级, 功能缺失',
+	'iTopUpdate:Error:MissingFile' => '缺少文件: %1$s',
+	'iTopUpdate:Error:CorruptedFile' => '文件 %1$s 已损坏',
+    'iTopUpdate:Error:BadFileFormat' => '上传的不是zip 文件',
+    'iTopUpdate:Error:BadFileContent' => '升级文件不是程序升级包',
+    'iTopUpdate:Error:BadItopProduct' => '升级文件与您的系统不兼容',
+	'iTopUpdate:Error:Copy' => '错误, 无法复制 \'%1$s\' 到 \'%2$s\'',
+    'iTopUpdate:Error:FileNotFound' => '文件找不到',
+    'iTopUpdate:Error:NoFile' => '没有提供文件',
+	'iTopUpdate:Error:InvalidToken' => '无效的token',
+	'iTopUpdate:Error:UpdateFailed' => '升级失败',
+	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => '上传上限太小. 请调整 PHP 配置.',

-	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
-	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
+	'iTopUpdate:UI:RestoreArchive' => '您可以从归档文件 \'%1$s\' 还原应用程序',
+	'iTopUpdate:UI:RestoreBackup' => '您可以从 \'%1$s\' 还原数据库',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
-	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
-	'Menu:iTopUpdate' => 'Application Upgrade~~',
-	'Menu:iTopUpdate+' => 'Application Upgrade~~',
+	'iTopUpdate:UI:UpdateDone' => '升级成功',
+	'Menu:iTopUpdate' => '应用升级',
+	'Menu:iTopUpdate+' => '应用升级',

    // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+    'Class:ModuleInstallation/Attribute:installed' => '安装在',
+    'Class:ModuleInstallation/Attribute:name' => '名称',
+    'Class:ModuleInstallation/Attribute:version' => '版本',
+    'Class:ModuleInstallation/Attribute:comment' => '备注',
 ));


--- a/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php
@@ -23,9 +23,9 @@

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Errors
-	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
-	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
+	'FilesInformation:Error:MissingFile' => '文件丢失: %1$s~~',
+	'FilesInformation:Error:CorruptedFile' => '文件 %1$s 已损坏',
+	'FilesInformation:Error:CantWriteToFile' => '无法写入文件 %1$s',
 ));


--- a/datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Dictionary entries go here
 	'Menu:iTopHub' => 'iTop Hub',
@@ -77,7 +78,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => '该扩展依赖模块: %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => '安装成功!',

-	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.',
+	'iTopHub:InstallationStatus:Installed_Version' => '%1$s 版本: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => '已安装',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>未</b> 安装.',
 ));
--- a/datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:IncidentManagement' => '事件管理',
 	'Menu:IncidentManagement+' => '事件管理',
--- a/datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
@@ -3,7 +3,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,10 +30,12 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -42,9 +45,11 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: KnownError
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:KnownError' => '已知错误',
 	'Class:KnownError+' => '记录一个已知错误',
--- a/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
@@ -3,7 +3,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Portal
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Page:DefaultTitle' => 'iTop 用户门户',
--- a/datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
@@ -3,7 +3,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,10 +30,12 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -42,6 +45,8 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ProblemManagement' => '问题管理',
 	'Menu:ProblemManagement+' => '问题管理',
--- a/datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:RequestManagement' => '服务台',
 	'Menu:RequestManagement+' => '服务台',
@@ -258,7 +259,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserRequest/Stimulus:ev_reopen+' => '',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => '等待批准',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => '无法分配父级需求到本身',

 	'Class:UserRequest/Method:ResolveChildTickets' => '解决子工单',
 	'Class:UserRequest/Method:ResolveChildTickets+' => '将该解决方案直接挪给子需求(自动解决), 包括下列字段: 服务, 团队, 办理人, 解决方案信息',
--- a/datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
@@ -3,7 +3,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:RequestManagement' => '服务台',
 	'Menu:RequestManagement+' => '服务台',
--- a/datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,6 +30,8 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ServiceManagement' => '服务管理',
 	'Menu:ServiceManagement+' => '服务管理概况',
--- a/datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
@@ -2,8 +2,8 @@
 /**
 * Localized data
 *
- * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,6 +30,8 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ServiceManagement' => '服务管理',
 	'Menu:ServiceManagement+' => '服务管理概况',
--- a/datamodels/2.x/itop-storage-mgmt/zh_cn.dict.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/zh_cn.dict.itop-storage-mgmt.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Dictionary entries go here
 ));
--- a/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
@@ -3,7 +3,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,9 +30,12 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
+
 //
 // Class: Ticket
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Ticket' => '工单',
 	'Class:Ticket+' => '',
--- a/datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:DataSources' => '同步数据源',
 	'Menu:DataSources+' => '所有同步数据源',
@@ -54,9 +55,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:UserAccountsMenu+' => '用户帐户',
 	'Menu:UserAccountsMenu:Title' => '用户帐户',
 	'Menu:MyShortcuts' => '我的快捷方式',
-	'Menu:UserManagement' => 'User Management~~',
-	'Menu:Queries' => 'Queries~~',
-	'Menu:Configuration' => 'Configuration~~',
+	'Menu:UserManagement' => '用户管理',
+	'Menu:Queries' => '查询',
+	'Menu:Configuration' => '配置',
 ));

 //
@@ -64,8 +65,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:AbstractResource' => 'Abstract Resource~~',
-	'Class:AbstractResource+' => '~~',
+	'Class:AbstractResource' => '抽象资源',
+	'Class:AbstractResource+' => '',
 ));

 //
@@ -73,8 +74,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ResourceAdminMenu' => 'Resource Admin Menu~~',
-	'Class:ResourceAdminMenu+' => '~~',
+	'Class:ResourceAdminMenu' => '资源管理菜单',
+	'Class:ResourceAdminMenu+' => '',
 ));

 //
@@ -83,7 +84,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResourceRunQueriesMenu' => 'Resource Run Queries Menu~~',
-	'Class:ResourceRunQueriesMenu+' => '~~',
+	'Class:ResourceRunQueriesMenu+' => '',
 ));

 //
@@ -92,5 +93,5 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(

 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResourceSystemMenu' => 'Resource System Menu~~',
-	'Class:ResourceSystemMenu+' => '~~',
+	'Class:ResourceSystemMenu+' => '',
 ));
--- a/dictionaries/zh_cn.dictionary.itop.core.php
+++ b/dictionaries/zh_cn.dictionary.itop.core.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Core:DeletedObjectLabel' => '%1s (已删除)',
 	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)',
@@ -104,8 +105,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(

 	'Core:AttributeEncryptedString' => '加密字符串',
 	'Core:AttributeEncryptedString+' => 'String encrypted with a local key',
-	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
-	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
+	'Core:AttributeEncryptUnknownLibrary' => '未知的加密库 (%1$s)',
+	'Core:AttributeEncryptFailedToDecrypt' => '** 解密错误 **',

 	'Core:AttributeText' => '文本',
 	'Core:AttributeText+' => '多行字符串',
@@ -614,8 +615,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TriggerOnObjectUpdate' => '触发器 (对象更新时)',
 	'Class:TriggerOnObjectUpdate+' => 'Trigger on object update of [a child class of] the given class~~',
-	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => 'Target fields~~',
-	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '~~',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => '目标字段',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '',
 ));

 //