🌐 Translations - improved translation for zh cn 20241108 #679

purplegrape · 2024-11-08T08:22:48Z

improved translation for zh cn 20241108

this pr is for zh-cn entries in "web/dictionaries" and "web/datamodels"

1.fix some missing line (compared to en.dict )
2. minor translation improvement

purplegrape · 2024-11-08T08:35:11Z

The structure of entries in datamodels change a lot, just do as en.dict

Hipska

I have some objections regarding the file headings..

datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php

Hipska · 2024-11-08T09:04:34Z

datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php

- * 
- */
-/**
- * @author Robert Deng <[email protected]>


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

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？

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

Hipska · 2024-11-08T09:06:18Z

datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php

-	'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+' => '',


Aren't these items supposed to be sorted alphabetically?

Hipska · 2024-11-08T09:06:58Z

...bodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'theme:darkmoon' => '暗月',
-]);
+]);


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

Hipska · 2024-11-08T09:08:32Z

datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php

- * Localized data
+ * Copyright (C) 2013-2024 Combodo SAS
 *
- * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0


Previous way was more correct, please revert this.

datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php

Hipska

Still some to fix..

Note I didn't put suggestions for every file, but I think you get it, please apply on all files where necessary.

datamodels/2.x/itop-themes-compat/dictionaries/zh_cn.dict.itop-themes-compat.php

dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop.orm-document.php

dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.uniqueness-rule.php

purplegrape · 2024-11-08T10:37:57Z

Still some to fix..

Note I didn't put suggestions for every file, but I think you get it, please apply on all files where necessary.

In your words，there is too much work to do
I've checked line by line against en.dict
I think it's fine to overwrite the files directly if no php syntax error

purplegrape · 2024-11-08T10:47:18Z

fixed, this pr should merge to support/3.2 , no conflicts now

fix syntax error

…o support/3.2

fix syntax error

…iTop into support/3.2" This reverts commit a530c51, reversing changes made to 3ab8c02.

jf-cbd · 2024-11-13T08:27:34Z

Hello, thanks a lot @purplegrape for your contributions and editions :D
I will perform the final checks and make any necessary edits.

Hipska · 2024-11-13T08:31:54Z

@purplegrape The current state of your PR is also undoing all the fixes in EN US dicts done by #678

jf-cbd · 2024-11-13T08:39:11Z

@purplegrape The current state of your PR is also undoing all the fixes in EN US dicts done by #678

True, but the current PR was created before I merged #678, so I'll address this.

Hipska · 2024-11-13T08:46:18Z

That should not happen by default. Its the way @purplegrape did a rebase and then copied over his old files or something..

…pe/support/3.2 # Conflicts: # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en.dict.itop-incident-mgmt-itil.php # dictionaries/zh_cn.dictionary.itop.core.php

….php Co-authored-by: Thomas Casteleyn <[email protected]>

….orm-document.php Co-authored-by: Thomas Casteleyn <[email protected]>

…ness-rule.php Co-authored-by: Thomas Casteleyn <[email protected]>

…legrape/support/3.2

Hipska

New batch of changes to apply

datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php

...bodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php

datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php

datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php

datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php

datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php

datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php

datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php

datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php

datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php

….php Co-authored-by: Thomas Casteleyn <[email protected]>

…onfig-mgmt.php Co-authored-by: Thomas Casteleyn <[email protected]>

…ct.itop-bridge-cmdb-services.php Co-authored-by: Thomas Casteleyn <[email protected]>

…zh_cn.dict.combodo-backoffice-darkmoon-theme.php Co-authored-by: Thomas Casteleyn <[email protected]>

…o-db-tools.php Co-authored-by: Thomas Casteleyn <[email protected]>

…ocal.php Co-authored-by: Thomas Casteleyn <[email protected]>

…hange-mgmt.php Co-authored-by: Thomas Casteleyn <[email protected]>

….itop-bridge-cmdb-ticket.php Co-authored-by: Thomas Casteleyn <[email protected]>

datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php

datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php

datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php

datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php

datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php

datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php

datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php

datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php

datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php

datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php

…top-change-mgmt-itil.php Co-authored-by: Thomas Casteleyn <[email protected]>

…oauth-client.php Co-authored-by: Thomas Casteleyn <[email protected]>

…ap.php Co-authored-by: Thomas Casteleyn <[email protected]>

….php Co-authored-by: Thomas Casteleyn <[email protected]>

…ore-update.php Co-authored-by: Thomas Casteleyn <[email protected]>

…-light.php Co-authored-by: Thomas Casteleyn <[email protected]>

…-hub-connector.php Co-authored-by: Thomas Casteleyn <[email protected]>

…itop-files-information.php Co-authored-by: Thomas Casteleyn <[email protected]>

….itop-incident-mgmt-itil.php Co-authored-by: Thomas Casteleyn <[email protected]>

…op-knownerror-mgmt.php Co-authored-by: Thomas Casteleyn <[email protected]>

….php Co-authored-by: Thomas Casteleyn <[email protected]>

…ortal-base.php Co-authored-by: Thomas Casteleyn <[email protected]>

purplegrape added 2 commits November 8, 2024 16:11

improved translation for zh cn

08dd9f7

improved zh-cn translation for datamodels

a618749

steffunky added the translation label Nov 8, 2024

Hipska suggested changes Nov 8, 2024

View reviewed changes

revert to https

cf55ddd

Hipska reviewed Nov 8, 2024

View reviewed changes

purplegrape changed the base branch from develop to support/3.2 November 8, 2024 10:44

Merge branch 'support/3.2' into support/3.2

feccee9

purplegrape added 6 commits November 8, 2024 23:00

Update zh_cn.dictionary.itop.ui.php

3ab8c02

fix syntax error

Merge branch 'support/3.2' of https://github.com/purplegrape/iTop int…

a530c51

…o support/3.2

Update zh_cn.dict.itop-bridge-cmdb-ticket.php

87aa68e

fix syntax error

Revert "Merge branch 'support/3.2' of https://github.com/purplegrape/…

57f5cfe

…iTop into support/3.2" This reverts commit a530c51, reversing changes made to 3ab8c02.

Update zh_cn.dict.itop-bridge-cmdb-ticket.php

f4cae0d

Update zh_cn.dictionary.itop.ui.php

e1fb7d5

jf-cbd self-requested a review November 13, 2024 08:59

jf-cbd and others added 8 commits November 13, 2024 11:20

Merge remote-tracking branch 'origin/support/3.2' into fork/purplegra…

70f48e9

…pe/support/3.2 # Conflicts: # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en.dict.itop-incident-mgmt-itil.php # dictionaries/zh_cn.dictionary.itop.core.php

Added some 3.2 changes

5ba601d

Update datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas…

8e83224

….php Co-authored-by: Thomas Casteleyn <[email protected]>

Update dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop…

41aa341

….orm-document.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.unique…

a22e6f3

…ness-rule.php Co-authored-by: Thomas Casteleyn <[email protected]>

Merge remote-tracking branch 'purplegrape/support/3.2' into fork/purp…

294f537

…legrape/support/3.2

🌐 Update translations

772dffc

🌐 sort alphabetically

9b85f8b

Hipska suggested changes Nov 13, 2024

View reviewed changes

jf-cbd and others added 8 commits November 13, 2024 12:02

Update datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas…

57d825f

….php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-c…

de95fb4

…onfig-mgmt.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.di…

ec1ca9b

…ct.itop-bridge-cmdb-services.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/…

6a0861d

…zh_cn.dict.combodo-backoffice-darkmoon-theme.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combod…

cf67c61

…o-db-tools.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-l…

76026ee

…ocal.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-c…

aedc5f1

…hange-mgmt.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict…

dfb08fe

….itop-bridge-cmdb-ticket.php Co-authored-by: Thomas Casteleyn <[email protected]>

Hipska suggested changes Nov 13, 2024

View reviewed changes

jf-cbd and others added 12 commits November 13, 2024 12:05

Update datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.i…

c788163

…top-change-mgmt-itil.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-…

88d1072

…oauth-client.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ld…

8828ba0

…ap.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config…

46be906

….php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-c…

c6051d9

…ore-update.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq…

9bd5be3

…-light.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop…

ff9e1e7

…-hub-connector.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.…

602b3f0

…itop-files-information.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict…

3bec0b9

….itop-incident-mgmt-itil.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.it…

26706e8

…op-knownerror-mgmt.php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal…

36bfc1e

….php Co-authored-by: Thomas Casteleyn <[email protected]>

Update datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-p…

941e113

…ortal-base.php Co-authored-by: Thomas Casteleyn <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌐 Translations - improved translation for zh cn 20241108 #679

🌐 Translations - improved translation for zh cn 20241108 #679

purplegrape commented Nov 8, 2024 •

edited

Loading

purplegrape commented Nov 8, 2024

Hipska left a comment

Hipska Nov 8, 2024

purplegrape Nov 8, 2024

Hipska Nov 8, 2024

Hipska Nov 8, 2024

Hipska Nov 8, 2024

Hipska Nov 8, 2024

Hipska left a comment

purplegrape commented Nov 8, 2024

purplegrape commented Nov 8, 2024

jf-cbd commented Nov 13, 2024

Hipska commented Nov 13, 2024

jf-cbd commented Nov 13, 2024

Hipska commented Nov 13, 2024

Hipska left a comment

🌐 Translations - improved translation for zh cn 20241108 #679

Are you sure you want to change the base?

🌐 Translations - improved translation for zh cn 20241108 #679

Conversation

purplegrape commented Nov 8, 2024 • edited Loading

purplegrape commented Nov 8, 2024

Hipska left a comment

Choose a reason for hiding this comment

Hipska Nov 8, 2024

Choose a reason for hiding this comment

purplegrape Nov 8, 2024

Choose a reason for hiding this comment

Hipska Nov 8, 2024

Choose a reason for hiding this comment

Hipska Nov 8, 2024

Choose a reason for hiding this comment

Hipska Nov 8, 2024

Choose a reason for hiding this comment

Hipska Nov 8, 2024

Choose a reason for hiding this comment

Hipska left a comment

Choose a reason for hiding this comment

purplegrape commented Nov 8, 2024

purplegrape commented Nov 8, 2024

jf-cbd commented Nov 13, 2024

Hipska commented Nov 13, 2024

jf-cbd commented Nov 13, 2024

Hipska commented Nov 13, 2024

Hipska left a comment

Choose a reason for hiding this comment

purplegrape commented Nov 8, 2024 •

edited

Loading