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

l10n: zh_CN: for git 2.45 rounds #771

Merged
merged 1 commit into from
Apr 28, 2024

Conversation

dyrone
Copy link

@dyrone dyrone commented Apr 24, 2024

Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list ([email protected]) for code submissions, code reviews, and
bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.

For a single-commit pull request, please leave the pull request description
empty
: your commit message itself should describe your changes.

Please read the "guidelines for contributing" linked above!

Copy link

github-actions bot commented Apr 24, 2024

Errors and warnings found by git-po-helper in workflow #706:

------------------------------------------------------------------------------
INFO [po/zh_CN.po@869047a]	5652 translated messages. 
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
------------------------------------------------------------------------------
ERROR [po/zh_CN.po@869047a]	1 new string(s) in 'po/git.pot', but not in your 'po/XX.po' 
ERROR [po/zh_CN.po@869047a]                        
ERROR [po/zh_CN.po@869047a]	  > po/git.pot:20232: this message is used but not defined in /tmp/3331389302--zh_CN.po 
ERROR [po/zh_CN.po@869047a]                        
ERROR [po/zh_CN.po@869047a]	You can download the latest "po/git.pot" file from: 
ERROR [po/zh_CN.po@869047a]                        
ERROR [po/zh_CN.po@869047a]		https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
ERROR [po/zh_CN.po@869047a]                        
ERROR [po/zh_CN.po@869047a]	Please rebase your branch to the latest upstream branch, 
ERROR [po/zh_CN.po@869047a]	run "git-po-helper update po/XX.po" to update your po file, 
ERROR [po/zh_CN.po@869047a]	and translate the new strings in it. 
ERROR [po/zh_CN.po@869047a]                        

ERROR: fail to execute "git-po-helper check-commits"

@dyrone dyrone force-pushed the tl/zh_CN_2.45.0_rnd branch 4 times, most recently from 66f6a0c to cac9890 Compare April 24, 2024 14:43
Copy link

@lilydjwg lilydjwg left a comment

Choose a reason for hiding this comment

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

另外希望下次能额外给出一份带行号的版本,这样方便跳转到到原文位置以辨别消息含义。

po/zh_CN.po Outdated Show resolved Hide resolved
po/zh_CN.po Outdated Show resolved Hide resolved
po/zh_CN.po Outdated Show resolved Hide resolved
po/zh_CN.po Outdated Show resolved Hide resolved
po/zh_CN.po Outdated Show resolved Hide resolved
@jiangxin
Copy link
Member

We have new translatable messages from upstream v2.45.0-rc1 and you can update your translations.

@dyrone
Copy link
Author

dyrone commented Apr 27, 2024

另外希望下次能额外给出一份带行号的版本,这样方便跳转到到原文位置以辨别消息含义。
👌🏻

@jiangxin
Copy link
Member

jiangxin commented Apr 28, 2024

@dyrone , some commits are not related for Git l10n, where do these commits come from?

40b24741cb add: plug a leak on interactive_add
80affb8a00 add-patch: plug a leak handling the '/' command
4e128d6b3e add-interactive: plug a leak in get_untracked_files
76fceaaf23 apply: plug a leak in apply_data
2a5753862b don't report vsnprintf(3) error as bug

@dyrone
Copy link
Author

dyrone commented Apr 28, 2024

@dyrone , some commits are not related for Git l10n, where do these commits come from?

40b24741cb add: plug a leak on interactive_add
80affb8a00 add-patch: plug a leak handling the '/' command
4e128d6b3e add-interactive: plug a leak in get_untracked_files
76fceaaf23 apply: plug a leak in apply_data
2a5753862b don't report vsnprintf(3) error as bug

From master, does anything wrong here?

@jiangxin jiangxin merged commit 1919aa0 into git-l10n:master Apr 28, 2024
2 checks passed
Copy link

@fangyi-zhou fangyi-zhou left a comment

Choose a reason for hiding this comment

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

抱歉在并入之后才看到邮件。可以在下一轮的时候一并修改。

" [--diagnose[=<mode>]]"
msgstr ""
"git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n"
"git bugreport [-o | --output-directory <文件>]\n"

Choose a reason for hiding this comment

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

是否应该被译为 <路径>?

@@ -13579,6 +13596,10 @@ msgstr ""
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"

Choose a reason for hiding this comment

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

这一行中的 promisor 未翻译,是否在下次可以一并修改?

msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
msgstr "git update-ref [<选项>] -d <引用名> [<旧对象>]"

Choose a reason for hiding this comment

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

<...-oid> 是否可以译为 <...对象 ID>

其他地方有这样的用法:https://github.com/dyrone/git/blob/b705d3a745575676d3963d7a60acd19d27eb661c/po/zh_CN.po#L15881


#: midx-write.c
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略已存在的多包索引,校验码不匹配"

Choose a reason for hiding this comment

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

逗号是否应改为分号?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants