-
Notifications
You must be signed in to change notification settings - Fork 238
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
Merged
Merged
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
08dd9f7
improved translation for zh cn
purplegrape a618749
improved zh-cn translation for datamodels
purplegrape cf55ddd
revert to https
purplegrape feccee9
Merge branch 'support/3.2' into support/3.2
purplegrape 3ab8c02
Update zh_cn.dictionary.itop.ui.php
purplegrape a530c51
Merge branch 'support/3.2' of https://github.com/purplegrape/iTop int…
purplegrape 87aa68e
Update zh_cn.dict.itop-bridge-cmdb-ticket.php
purplegrape 57f5cfe
Revert "Merge branch 'support/3.2' of https://github.com/purplegrape/…
purplegrape f4cae0d
Update zh_cn.dict.itop-bridge-cmdb-ticket.php
purplegrape e1fb7d5
Update zh_cn.dictionary.itop.ui.php
purplegrape 70f48e9
Merge remote-tracking branch 'origin/support/3.2' into fork/purplegra…
jf-cbd 5ba601d
Added some 3.2 changes
jf-cbd 8e83224
Update datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas…
jf-cbd 41aa341
Update dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop…
jf-cbd a22e6f3
Update dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.unique…
jf-cbd 294f537
Merge remote-tracking branch 'purplegrape/support/3.2' into fork/purp…
jf-cbd 772dffc
:globe_with_meridians: Update translations
jf-cbd 9b85f8b
:globe_with_meridians: sort alphabetically
jf-cbd 57d825f
Update datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas…
jf-cbd de95fb4
Update datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-c…
jf-cbd ec1ca9b
Update datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.di…
jf-cbd 6a0861d
Update datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/…
jf-cbd cf67c61
Update datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combod…
jf-cbd 76026ee
Update datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-l…
jf-cbd aedc5f1
Update datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-c…
jf-cbd dfb08fe
Update datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict…
jf-cbd c788163
Update datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.i…
jf-cbd 88d1072
Update datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-…
jf-cbd 8828ba0
Update datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ld…
jf-cbd 46be906
Update datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config…
jf-cbd c6051d9
Update datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-c…
jf-cbd 9bd5be3
Update datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq…
jf-cbd ff9e1e7
Update datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop…
jf-cbd 602b3f0
Update datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.…
jf-cbd 3bec0b9
Update datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict…
jf-cbd 26706e8
Update datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.it…
jf-cbd 36bfc1e
Update datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal…
jf-cbd 941e113
Update datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-p…
jf-cbd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,12 +4,39 @@ | |
* | ||
* @copyright Copyright (C) 2010-2024 Combodo SAS | ||
* @license https://opensource.org/licenses/AGPL-3.0 | ||
* | ||
* | ||
*/ | ||
/** | ||
* @author Robert Deng <[email protected]> | ||
* | ||
* 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.'外部验证身份', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,12 +4,38 @@ | |
* | ||
* @copyright Copyright (C) 2010-2024 Combodo SAS | ||
* @license https://opensource.org/licenses/AGPL-3.0 | ||
* | ||
*/ | ||
/** | ||
* @author Robert Deng <[email protected]> | ||
* | ||
* 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认证', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,15 +4,44 @@ | |
* | ||
* @copyright Copyright (C) 2010-2024 Combodo SAS | ||
* @license https://opensource.org/licenses/AGPL-3.0 | ||
* | ||
*/ | ||
/** | ||
* @author Robert Deng <[email protected]> | ||
* | ||
* 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' => '允许过期', | ||
|
@@ -23,11 +52,10 @@ | |
'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '', | ||
'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' => '不允许用户为自己设置 "一次性密码" 的失效期限', | ||
]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
.There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.