Skip to content

Conversation

@jiangxin
Copy link
Member

Diff from TengLong's version

1:  44a46d5e7d ! 1:  a8da0bab8e l10n: zh_CN: updated translation for 2.51
    @@ Commit message
         l10n: zh_CN: updated translation for 2.51
     
         Signed-off-by: Teng Long <[email protected]>
    +    Reviewed-by: 依云 <[email protected]>
    +    Signed-off-by: Jiang Xin <[email protected]>
     
      ## po/zh_CN.po ##
     @@ po/zh_CN.po: msgid ""
    @@ po/zh_CN.po: msgid ""
      "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
     -"POT-Creation-Date: 2025-06-08 20:30+0800\n"
     -"PO-Revision-Date: 2025-06-12 14:50+0800\n"
    -+"POT-Creation-Date: 2025-08-15 14:41+0800\n"
    -+"PO-Revision-Date: 2025-08-15 15:39+0800\n"
    ++"POT-Creation-Date: 2025-08-12 20:20-0400\n"
    ++"PO-Revision-Date: 2025-08-17 08:14-0400\n"
      "Last-Translator: Teng Long <[email protected]>\n"
      "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
      "Language: zh_CN\n"
    @@ po/zh_CN.po: msgid "bad action '%s' for '%s'"
      #: ls-refs.c parallel-checkout.c sequencer.c setup.c
      #, c-format
      msgid "invalid value for '%s': '%s'"
    +@@ po/zh_CN.po: msgstr "HEAD 没有位于 /refs/heads 之下!"
    + 
    + #: builtin/branch.c
    + msgid ""
    +-"branch with --recurse-submodules can only be used if "
    +-"submodule.propagateBranches is enabled"
    ++"branch with --recurse-submodules can only be used if submodule."
    ++"propagateBranches is enabled"
    + msgstr ""
    + "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
    + 
     @@ po/zh_CN.po: msgstr ""
      "请检查下面错误报告中余下的内容。\n"
      "您可以删除任何您不想共享的内容。\n"
    @@ po/zh_CN.po: msgstr ""
      #: builtin/fetch.c
      msgid "multiple branches detected, incompatible with --set-upstream"
      msgstr "检测到多分支,和 --set-upstream 不兼容"
    +@@ po/zh_CN.po: msgstr "协议不支持 --negotiate-only,退出"
    + 
    + #: builtin/fetch.c
    + msgid ""
    +-"--filter can only be used with the remote configured in "
    +-"extensions.partialclone"
    ++"--filter can only be used with the remote configured in extensions."
    ++"partialclone"
    + msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
    + 
    + #: builtin/fetch.c
     @@ po/zh_CN.po: msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
      msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
      msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
    @@ po/zh_CN.po: msgstr ""
      #: builtin/pack-refs.c
      msgid ""
      "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
    +@@ po/zh_CN.po: msgid ""
    + "upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
    + msgstr ""
    + "\n"
    +-"为了让没有追踪上游的分支自动配置,参见 'git help config' 中的 "
    +-"push.autoSetupRemote。\n"
    ++"为了让没有追踪上游的分支自动配置,参见 'git help config' 中的 'push."
    ++"autoSetupRemote'。\n"
    + 
    + #: builtin/push.c
    + #, c-format
    +@@ po/zh_CN.po: msgstr "--empty=ask 已弃用;请使用 '--empty=stop'。"
    + #: builtin/rebase.c
    + #, c-format
    + msgid ""
    +-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
    +-"\"stop\"."
    ++"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop"
    ++"\"."
    + msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"stop\"。"
    + 
    + #: builtin/rebase.c
     @@ po/zh_CN.po: msgstr ""
      msgid "unknown --mirror argument: %s"
      msgstr "未知的 --mirror 参数:%s"
    @@ po/zh_CN.po: msgstr "贮藏中包含未跟踪文件"
     +#: builtin/stash.c
     +#, c-format
     +msgid "cannot parse parents of commit: %s"
    -+msgstr "无法解析提交的父提交:%s"
    ++msgstr "无法解析该提交的父提交:%s"
     +
     +#: builtin/stash.c
     +#, c-format
    @@ po/zh_CN.po: msgstr "贮藏中包含未跟踪文件"
     +
     +#: builtin/stash.c
     +msgid "exactly one of --print and --to-ref is required"
    -+msgstr "必须指定 --print 或 --to-ref 之一,且只能选一个"
    ++msgstr "参数 --print 和 --to-ref 必须二选一"
     +
      #: builtin/stripspace.c
      msgid "skip and remove all lines starting with comment character"
    @@ po/zh_CN.po: msgstr "准备工作区(重置分支 '%s',之前为 %s)"
      #: builtin/worktree.c
      #, c-format
      msgid "Preparing worktree (detached HEAD %s)"
    +@@ po/zh_CN.po: msgstr "正尝试写提交图,但是 'core.commitGraph' 被禁用"
    + #: commit-graph.c
    + #, c-format
    + msgid ""
    +-"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
    +-"(%d) is not supported"
    ++"attempting to write a commit-graph, but 'commitGraph."
    ++"changedPathsVersion' (%d) is not supported"
    + msgstr "尝试写入提交图,但不支持 'commitGraph.changedPathsVersion' (%d)"
    + 
    + #: commit-graph.c
    +@@ po/zh_CN.po: msgid ""
    + "remote URLs cannot be configured in file directly or indirectly included by "
    + "includeIf.hasconfig:remote.*.url"
    + msgstr ""
    +-"远程 URL 不能在文件中配置,不管直接地还是通过 "
    +-"includeIf.hasconfig:remote.*.url 间接地包含。"
    ++"远程 URL 不能在文件中配置,不管直接地还是通过 includeIf.hasconfig:remote.*."
    ++"url 间接地包含"
    + 
    + #: config.c
    + #, c-format
     @@ po/zh_CN.po: msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
      msgid "bad numeric config value '%s' for '%s' in %s: %s"
      msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
    @@ po/zh_CN.po: msgstr "不允许空的姓名(对于 <%s>)"
     +#: imap-send.c
     +msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
     +msgstr ""
    -+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <文件夹>] < <邮箱>"
    ++"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <文件夹>] < <mbox>"
     +
     +#: imap-send.c
     +msgid "no IMAP host specified"
    @@ po/zh_CN.po: msgstr "错误:"
     +msgstr ""
     +"'%s' 命令已被提名移除。\n"
     +"如果您仍在使用该命令,请在命令行中添加额外选项\n"
    -+"'--i-still-use-this',并通过邮件通知我们您仍在使用它\n"
    -+"发送至 <[email protected]>。谢谢。\n"
    ++"'--i-still-use-this',并通过发送邮件至 <[email protected]> \n"
    ++"通知我们您仍在使用它。谢谢。\n"
     +
     +#: usage.c
     +msgid "refusing to run without --i-still-use-this"

@github-actions
Copy link

github-actions bot commented Aug 17, 2025

Warnings found by git-po-helper in workflow #1056:

------------------------------------------------------------------------------
INFO [po/zh_CN.po@2d4b8b0]	5856 translated messages. 
------------------------------------------------------------------------------
WARNING commit 2d4b8b0: author (Teng Long <[email protected]>) and committer (Jiang Xin <[email protected]>) are different 
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 

Signed-off-by: Teng Long <[email protected]>
Reviewed-by: Fangyi Zhou <[email protected]>
Reviewed-by: 依云 <[email protected]>
Signed-off-by: Jiang Xin <[email protected]>
@jiangxin
Copy link
Member Author

采纳了 @fangyi-zhou#851 的修建建议,如下:

1:  a8da0bab8e ! 1:  2d4b8b041e l10n: zh_CN: updated translation for 2.51
    @@ Commit message
         l10n: zh_CN: updated translation for 2.51
     
         Signed-off-by: Teng Long <[email protected]>
    +    Reviewed-by: Fangyi Zhou <[email protected]>
         Reviewed-by: 依云 <[email protected]>
         Signed-off-by: Jiang Xin <[email protected]>
     
    @@ po/zh_CN.po: msgstr "git config [<文件选项>] --get-colorbool <名称> [<标
      
      #: builtin/config.c
      msgid "Config file location"
    +@@ po/zh_CN.po: msgstr "不能解析模式:%s"
    + #: builtin/diff-pairs.c
    + #, c-format
    + msgid "unable to parse object id: %s"
    +-msgstr "不能解析对象ID:%s"
    ++msgstr "不能解析对象 ID:%s"
    + 
    + #: builtin/diff-pairs.c
    + msgid "git diff-pairs -z [<diff-options>]"
     @@ po/zh_CN.po: msgstr "%s 未发送所有必需的对象"
      msgid "rejected %s because shallow roots are not allowed to be updated"
      msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
    @@ po/zh_CN.po: msgstr "只能在工作区的顶级目录中使用相对路径"
      #: builtin/submodule--helper.c
      #, c-format
      msgid "'%s' is not a valid submodule name"
    +@@ po/zh_CN.po: msgstr "从标准输入读取更新"
    + 
    + #: builtin/update-ref.c
    + msgid "batch reference updates"
    +-msgstr "批量引用更新"
    ++msgstr "批量处理引用更新"
    + 
    + #: builtin/update-server-info.c
    + msgid "update the info files from scratch"
     @@ po/zh_CN.po: msgstr "准备工作区(重置分支 '%s',之前为 %s)"
      msgid "Preparing worktree (checking out '%s')"
      msgstr "准备工作区(检出 '%s')"
    @@ po/zh_CN.po: msgstr "不允许空的姓名(对于 <%s>)"
      #: list-objects-filter-options.c
      msgid "expected 'tree:<depth>'"
      msgstr "期望 'tree:<深度>'"
    +@@ po/zh_CN.po: msgstr "无法解析 %s 的头部"
    + #: object-file.c
    + #, c-format
    + msgid "unable to parse type from header '%s' of %s"
    +-msgstr "无法从 %s 的包头 '%s' 中解析类型"
    ++msgstr "无法从 %2$s 的包头 '%1$s' 中解析类型"
    + 
    + #: object-file.c
    + #, c-format
     @@ po/zh_CN.po: msgstr "需要 <对象>:<路径>,只给出了 <对象> '%s'"
      msgid "invalid object name '%.*s'."
      msgstr "无效的对象名 '%.*s'。"

@jiangxin jiangxin merged commit 949318c into git-l10n:master Aug 17, 2025
3 checks passed
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.

2 participants