Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌐 Translations - improved translation for zh cn 20241108 #679

Open
wants to merge 38 commits into
base: support/3.2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
08dd9f7
improved translation for zh cn
purplegrape Nov 8, 2024
a618749
improved zh-cn translation for datamodels
purplegrape Nov 8, 2024
cf55ddd
revert to https
purplegrape Nov 8, 2024
feccee9
Merge branch 'support/3.2' into support/3.2
purplegrape Nov 8, 2024
3ab8c02
Update zh_cn.dictionary.itop.ui.php
purplegrape Nov 8, 2024
a530c51
Merge branch 'support/3.2' of https://github.com/purplegrape/iTop int…
purplegrape Nov 8, 2024
87aa68e
Update zh_cn.dict.itop-bridge-cmdb-ticket.php
purplegrape Nov 8, 2024
57f5cfe
Revert "Merge branch 'support/3.2' of https://github.com/purplegrape/…
purplegrape Nov 8, 2024
f4cae0d
Update zh_cn.dict.itop-bridge-cmdb-ticket.php
purplegrape Nov 9, 2024
e1fb7d5
Update zh_cn.dictionary.itop.ui.php
purplegrape Nov 9, 2024
70f48e9
Merge remote-tracking branch 'origin/support/3.2' into fork/purplegra…
jf-cbd Nov 13, 2024
5ba601d
Added some 3.2 changes
jf-cbd Nov 13, 2024
8e83224
Update datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas…
jf-cbd Nov 13, 2024
41aa341
Update dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop…
jf-cbd Nov 13, 2024
a22e6f3
Update dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.unique…
jf-cbd Nov 13, 2024
294f537
Merge remote-tracking branch 'purplegrape/support/3.2' into fork/purp…
jf-cbd Nov 13, 2024
772dffc
:globe_with_meridians: Update translations
jf-cbd Nov 13, 2024
9b85f8b
:globe_with_meridians: sort alphabetically
jf-cbd Nov 13, 2024
57d825f
Update datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas…
jf-cbd Nov 13, 2024
de95fb4
Update datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-c…
jf-cbd Nov 13, 2024
ec1ca9b
Update datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.di…
jf-cbd Nov 13, 2024
6a0861d
Update datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/…
jf-cbd Nov 13, 2024
cf67c61
Update datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combod…
jf-cbd Nov 13, 2024
76026ee
Update datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-l…
jf-cbd Nov 13, 2024
aedc5f1
Update datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-c…
jf-cbd Nov 13, 2024
dfb08fe
Update datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict…
jf-cbd Nov 13, 2024
c788163
Update datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.i…
jf-cbd Nov 13, 2024
88d1072
Update datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-…
jf-cbd Nov 13, 2024
8828ba0
Update datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ld…
jf-cbd Nov 13, 2024
46be906
Update datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config…
jf-cbd Nov 13, 2024
c6051d9
Update datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-c…
jf-cbd Nov 13, 2024
9bd5be3
Update datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq…
jf-cbd Nov 13, 2024
ff9e1e7
Update datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop…
jf-cbd Nov 13, 2024
602b3f0
Update datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.…
jf-cbd Nov 13, 2024
3bec0b9
Update datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict…
jf-cbd Nov 13, 2024
26706e8
Update datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.it…
jf-cbd Nov 13, 2024
36bfc1e
Update datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal…
jf-cbd Nov 13, 2024
941e113
Update datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-p…
jf-cbd Nov 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
*
* @copyright Copyright (C) 2013 XXXXX
jf-cbd marked this conversation as resolved.
Show resolved Hide resolved
* @license http://opensource.org/licenses/AGPL-3.0
jf-cbd marked this conversation as resolved.
Show resolved Hide resolved
*/

Dict::Add('ZH CN', 'Chinese', '简体中文', [
'CAS:Error:UserNotAllowed' => '用户被禁止登录',
'CAS:Login:SignIn' => '使用CAS登录',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,38 @@
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
* @author Robert Deng <[email protected]>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not nice to remove original authors. Same remark for the other files where You removed the @author.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robert Deng is the zh cn maintainer quite many years ago,I am the main contributor of zh-cn in the recent 2 years
in my mind,the “@author” line was removed by me since itop 2.4 or 2.5
why it appears in iTop 3.2 again?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

He still is the original author. Should not be removed, only add a new @author if needed.

* @license http://opensource.org/licenses/AGPL-3.0
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* 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>+
// Class:<class_name>/Attribute:<attribute_code>
// Class:<class_name>/Attribute:<attribute_code>+
// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
// Class:<class_name>/Stimulus:<stimulus_code>
// Class:<class_name>/Stimulus:<stimulus_code>+

//
// Class: UserExternal
//

Dict::Add('ZH CN', 'Chinese', '简体中文', [
'Class:UserExternal' => '外部用户',
'Class:UserExternal+' => '用户在'.ITOP_APPLICATION_SHORT.'外部验证身份',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,38 @@
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
* @author Robert Deng <[email protected]>
* @license http://opensource.org/licenses/AGPL-3.0
jf-cbd marked this conversation as resolved.
Show resolved Hide resolved
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* 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>+
// Class:<class_name>/Attribute:<attribute_code>
// Class:<class_name>/Attribute:<attribute_code>+
// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
// Class:<class_name>/Stimulus:<stimulus_code>
// Class:<class_name>/Stimulus:<stimulus_code>+

//
// Class: UserLDAP
//

Dict::Add('ZH CN', 'Chinese', '简体中文', [
'Class:UserLDAP' => 'LDAP用户',
'Class:UserLDAP+' => '用户身份由LDAP认证',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,58 @@
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
* @author Robert Deng <[email protected]>
* @license http://opensource.org/licenses/AGPL-3.0
jf-cbd marked this conversation as resolved.
Show resolved Hide resolved
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* 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>+
// Class:<class_name>/Attribute:<attribute_code>
// Class:<class_name>/Attribute:<attribute_code>+
// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
// 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', '简体中文', [
'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
'Class:UserLocal+' => '用户由'.ITOP_APPLICATION_SHORT.'验证身份',
'Class:UserLocal/Attribute:password' => '密码',
'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',

'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:force_expire' => '已过期',
'Class:UserLocal/Attribute:expiration/Value:force_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+' => '',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't these items supposed to be sorted alphabetically?

'Class:UserLocal/Attribute:expiration/Value:otp_expire' => '一次性密码',
'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
'Class:UserLocal/Attribute:password' => '密码',
'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',
'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',

'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符, 包含大小写, 数字和特殊字符.',
'UserLocal:password:expiration' => '下面的区域需要插件扩展',
'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',
]);
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,24 @@
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
* @license http://opensource.org/licenses/AGPL-3.0
jf-cbd marked this conversation as resolved.
Show resolved Hide resolved
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* 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', '简体中文', [
'theme:darkmoon' => '暗月',
]);
]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please re-add the missing newline at end of file.

Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,94 @@
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
* @license http://opensource.org/licenses/AGPL-3.0
jf-cbd marked this conversation as resolved.
Show resolved Hide resolved
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* 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', '简体中文', [
'DBAnalyzer-Fetch-Count-Error' => '读取计数出错于 `%1$s`, %2$d个记录已读取 / %3$d已',
'DBAnalyzer-Integrity-FinalClass' => '字段 `%2$s`.`%1$s` 必须是相同的值, 而不是 `%3$s`.`%1$s`',
'DBAnalyzer-Integrity-HKInvalid' => '损坏的层级链 `%1$s`',
'DBAnalyzer-Integrity-InvalidExtKey' => '无效的外键%1$s (列: `%2$s.%3$s`)',
'DBAnalyzer-Integrity-InvalidValue' => '无效的值%1$s (列: `%2$s.%3$s`)',
'DBAnalyzer-Integrity-MissingExtKey' => '外键丢失%1$s (列: `%2$s.%3$s`)',
'DBAnalyzer-Integrity-OrphanRecord' => '孤立记录位于 `%1$s`, 其应该有副本位于表 `%2$s`',
'DBAnalyzer-Integrity-RootFinalClass' => '字段 `%2$s`.`%1$s` 必须包含一个有效的类型',
'DBAnalyzer-Integrity-UsersWithoutProfile' => '一些用户账号没有角色',
'DBTools:Analyze' => '分析',
'DBTools:Base' => '数据库',

// Database inconsistencies
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
// Dictionary entries go here
'Menu:DBToolsMenu' => '数据库工具',
'DBTools:Class' => '类型',
'DBTools:Count' => '个数',
'DBTools:DatabaseInfo' => '数据库信息',
'DBTools:DetailedErrorLimit' => '列表限制为%1$s错误',
'DBTools:DetailedErrorTitle' => '%2$s个错误在类型%1$s: %3$s',
'DBTools:Details' => '显示详情',
'DBTools:Title' => '数据库维护工具',
'DBTools:ErrorsFound' => '发现错误',
'DBTools:Indication' => '重要: 修复数据库错误后, 可能会出现新的不一致, 您必须重新运行一次分析.',
'DBTools:Disclaimer' => '免责申明: 在应用修复之前, 应先备份数据库',
'DBTools:Error' => '错误',
'DBTools:ErrorsFound' => '发现错误',
'DBTools:FetchCheck' => '提取检查 (耗时长)',
'DBTools:Count' => '个数',
'DBTools:SQLquery' => 'SQL查询',
'DBTools:FixitSQLquery' => '修复问题的SQL查询 (指示)',
'DBTools:SQLresult' => 'SQL结果',
'DBTools:NoError' => '数据库正确',
'DBTools:HideIds' => '错误列表',
'DBTools:Inconsistencies' => '数据库不一致',
'DBTools:Indication' => '重要: 修复数据库错误后, 可能会出现新的不一致, 您必须重新运行一次分析.',
'DBTools:ShowIds' => '详细视图',
'DBTools:ShowReport' => '报告',
'DBTools:IntegrityCheck' => '完整性检查',
'DBTools:FetchCheck' => '提取检查 (耗时长)',
'DBTools:SelectAnalysisType' => '请选择分析类型',

'DBTools:Analyze' => '分析',
'DBTools:Details' => '显示详情',
'DBTools:ShowAll' => '显示所有错误',

'DBTools:Inconsistencies' => '数据库不一致',
'DBTools:DetailedErrorTitle' => '%2$s个错误在类型%1$s: %3$s',
'DBTools:DetailedErrorLimit' => '列表限制为%1$s错误',

'DBAnalyzer-Integrity-OrphanRecord' => '孤立记录位于 `%1$s`, 其应该有副本位于表 `%2$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' => '一些用户账号没有角色',
'DBAnalyzer-Integrity-HKInvalid' => '损坏的层级链 `%1$s`',
'DBAnalyzer-Fetch-Count-Error' => '读取计数出错于 `%1$s`, %2$d个记录已读取 / %3$d已',
'DBAnalyzer-Integrity-FinalClass' => '字段 `%2$s`.`%1$s` 必须是相同的值, 而不是 `%3$s`.`%1$s`',
'DBAnalyzer-Integrity-RootFinalClass' => '字段 `%2$s`.`%1$s` 必须包含一个有效的类型',
));

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

// Lost attachments
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'DBTools:LostAttachments' => '附件缺失',
'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 这不是数据恢复工具, 其无法恢复已删除的数据.',

'DBTools:LostAttachments:Button:Analyze' => '分析',
'DBTools:LostAttachments:Button:Busy' => '请稍后...',
'DBTools:LostAttachments:Button:Restore' => '还原',
'DBTools:LostAttachments:Button:Restore:Confirm' => '此操作无法回退, 请确认是否继续还原.',
'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 这不是数据恢复工具, 其无法恢复已删除的数据.',
'DBTools:LostAttachments:History' => '附件 "%1$s" 已使用数据库工具还原',
'DBTools:LostAttachments:Button:Busy' => '请稍候...',

'DBTools:LostAttachments:Step:Analyze' => '首先, 通过分析数据库来搜索丢失或误挪动的附件.',

'DBTools:LostAttachments:Step:AnalyzeResults' => '分析结果:',
'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => '当前位置',
'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => '文件名',
'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => '移动到...',
'DBTools:LostAttachments:Step:AnalyzeResults:None' => '非常好! 所有附件都是正常的.',
'DBTools:LostAttachments:Step:AnalyzeResults:Some' => '某些附件 (%1$d) 看起来放错了位置. 请检查下面的列表并选择要挪动的文件.',
'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => '文件名',
'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => '当前位置',
'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => '移动到...',

'DBTools:LostAttachments:Step:RestoreResults' => '还原结果:',
'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d的附件被还原.',

'DBTools:LostAttachments:StoredAsInlineImage' => '存储为内嵌图像',
'DBTools:NoError' => '数据库正确',
'DBTools:SQLquery' => 'SQL查询',
'DBTools:SQLresult' => 'SQL结果',
'DBTools:SelectAnalysisType' => '请选择分析类型',
'DBTools:ShowAll' => '显示所有错误',
'DBTools:ShowIds' => '详细视图',
'DBTools:ShowReport' => '报告',
'DBTools:Size' => '大小',
'DBTools:Title' => '数据库维护工具',
'Menu:DBToolsMenu' => '数据库工具',
]);
'DBTools:LostAttachments:History' => '附件 "%1$s" 已使用数据库工具还原',
));
Loading