Skip to content

Commit

Permalink
typo: use more general expressions "mismatched patterns"
Browse files Browse the repository at this point in the history 
Signed-off-by: Jiang Xin <[email protected]>
  • Loading branch information
@jiangxin
jiangxin committed Jan 2, 2024
1 parent e802a23 commit 3a7eb7b
Show file tree
Hide file tree
Showing 11 changed files with 164 additions and 164 deletions.
28 changes: 14 additions & 14 deletions test/t0031-check-typos-in-po.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ test_expect_success "mismatched shell variables" '
------------------------------------------------------------------------------
level=info msg="[po/zh_CN.po] 2 translated messages."
------------------------------------------------------------------------------
level=warning msg="[po/zh_CN.po] mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
level=warning msg="[po/zh_CN.po] mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
level=warning msg="[po/zh_CN.po] >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
level=warning msg="[po/zh_CN.po] >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: $command, $res"
level=warning msg="[po/zh_CN.po] mismatched patterns: $command, $res"
level=warning msg="[po/zh_CN.po] >> msgid: exit code $res from $command is < 0 or >= 128"
level=warning msg="[po/zh_CN.po] >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
level=warning msg="[po/zh_CN.po]"
Expand Down Expand Up @@ -87,7 +87,7 @@ test_expect_success "trash variables in msgStr (--typos=error)" '
------------------------------------------------------------------------------
level=info msg="[po/zh_CN.po] 1 translated message."
------------------------------------------------------------------------------
level=error msg="[po/zh_CN.po] mismatch variable names: $command, $res"
level=error msg="[po/zh_CN.po] mismatched patterns: $command, $res"
level=error msg="[po/zh_CN.po] >> msgid: exit code %d from %s is < 0 or >= 128"
level=error msg="[po/zh_CN.po] >> msgstr: 命令 $command 的退出码 $res 应该 < 0 或 >= 128"
level=error msg="[po/zh_CN.po]"
Expand Down Expand Up @@ -151,35 +151,35 @@ test_expect_success "check typos of mismatched constant strings" '
------------------------------------------------------------------------------
level=info msg="[po/zh_CN.po] 9 translated messages."
------------------------------------------------------------------------------
level=warning msg="[po/zh_CN.po] mismatch variable names: CHERRY_PICK_HEAD, CHERRY_PICK_HEADS"
level=warning msg="[po/zh_CN.po] mismatched patterns: CHERRY_PICK_HEAD, CHERRY_PICK_HEADS"
level=warning msg="[po/zh_CN.po] >> msgid: CHERRY_PICK_HEAD exists"
level=warning msg="[po/zh_CN.po] >> msgstr: 已存在 CHERRY_PICK_HEADS"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: config_variable"
level=warning msg="[po/zh_CN.po] mismatched patterns: config_variable"
level=warning msg="[po/zh_CN.po] >> msgid: check settings of config_variable"
level=warning msg="[po/zh_CN.po] >> msgstr: 检查配置变量的设置"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: config.variables"
level=warning msg="[po/zh_CN.po] mismatched patterns: config.variables"
level=warning msg="[po/zh_CN.po] >> msgid: checking config.variables (one command)"
level=warning msg="[po/zh_CN.po] >> msgstr: 检查 配置.变量（一条命令）"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: config.variables"
level=warning msg="[po/zh_CN.po] mismatched patterns: config.variables"
level=warning msg="[po/zh_CN.po] >> msgid: checking config.variables (%d commands)"
level=warning msg="[po/zh_CN.po] >> msgstr: 检查 配置.变量（%d 条命令）"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --interactive, git rebase--interactive"
level=warning msg="[po/zh_CN.po] mismatched patterns: --interactive, git rebase--interactive"
level=warning msg="[po/zh_CN.po] >> msgid: git rebase--interactive [options]"
level=warning msg="[po/zh_CN.po] >> msgstr: git rebase --interactive [参数]"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: git-credential--helper, git-credential-helper"
level=warning msg="[po/zh_CN.po] mismatched patterns: git-credential--helper, git-credential-helper"
level=warning msg="[po/zh_CN.po] >> msgid: git-credential--helper [options]"
level=warning msg="[po/zh_CN.po] >> msgstr: git-credential-helper [参数]"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: log.graphColors, log.graphColorss"
level=warning msg="[po/zh_CN.po] mismatched patterns: log.graphColors, log.graphColorss"
level=warning msg="[po/zh_CN.po] >> msgid: ignore invalid color %.*s in log.graphColors"
level=warning msg="[po/zh_CN.po] >> msgstr: 忽略 log.graphColorss 中无效的颜色 %.*s"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: color.blame.repeatedLines, color.blame.repeatedlines"
level=warning msg="[po/zh_CN.po] mismatched patterns: color.blame.repeatedLines, color.blame.repeatedlines"
level=warning msg="[po/zh_CN.po] >> msgid: invalid color %s in color.blame.repeatedLines"
level=warning msg="[po/zh_CN.po] >> msgstr: color.blame.repeatedlines 中无效的颜色值 %s"
level=warning msg="[po/zh_CN.po]"
Expand Down Expand Up @@ -220,15 +220,15 @@ test_expect_success "check typos of mismatched options" '
------------------------------------------------------------------------------
level=info msg="[po/zh_CN.po] 3 translated messages."
------------------------------------------------------------------------------
level=warning msg="[po/zh_CN.po] mismatch variable names: --3way"
level=warning msg="[po/zh_CN.po] mismatched patterns: --3way"
level=warning msg="[po/zh_CN.po] >> msgid: --reject and --3way cannot be used together."
level=warning msg="[po/zh_CN.po] >> msgstr: --reject 和 -3way 不能同时使用。"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --word-diff-regex="
level=warning msg="[po/zh_CN.po] mismatched patterns: --word-diff-regex="
level=warning msg="[po/zh_CN.po] >> msgid: equivalent to --word-diff=color --word-diff-regex=<regex>"
level=warning msg="[po/zh_CN.po] >> msgstr: 相当于 --word-diff=color --word-diff-regex=正则"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --intent-to-add, --intent-to-addd"
level=warning msg="[po/zh_CN.po] mismatched patterns: --intent-to-add, --intent-to-addd"
level=warning msg="[po/zh_CN.po] >> msgid: mark new files with `git add --intent-to-add`"
level=warning msg="[po/zh_CN.po] >> msgstr: 使用命令 `git add --intent-to-addd` 标记新增文件"
level=warning msg="[po/zh_CN.po]"
Expand Down
26 changes: 13 additions & 13 deletions test/t0032-typos-in-zh_CN.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,55 +15,55 @@ cat >expect <<-\EOF
------------------------------------------------------------------------------
level=info msg="[po/zh_CN.po] 5104 translated messages."
------------------------------------------------------------------------------
level=warning msg="[po/zh_CN.po] mismatch variable names: FSCK_IGNORE"
level=warning msg="[po/zh_CN.po] mismatched patterns: FSCK_IGNORE"
level=warning msg="[po/zh_CN.po] >> msgid: %d (FSCK_IGNORE?) should never trigger this callback"
level=warning msg="[po/zh_CN.po] >> msgstr: %d（忽略 FSCK?）不应该触发这个调用"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: extensions.partialClone, extensions.partialclone"
level=warning msg="[po/zh_CN.po] mismatched patterns: extensions.partialClone, extensions.partialclone"
level=warning msg="[po/zh_CN.po] >> msgid: --filter can only be used with the remote configured in extensions.partialclone"
level=warning msg="[po/zh_CN.po] >> msgstr: 只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --porcelain"
level=warning msg="[po/zh_CN.po] mismatched patterns: --porcelain"
level=warning msg="[po/zh_CN.po] >> msgid: --progress can't be used with --incremental or porcelain formats"
level=warning msg="[po/zh_CN.po] >> msgstr: --progress 不能和 --incremental 或 --porcelain 同时使用"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: git-am"
level=warning msg="[po/zh_CN.po] mismatched patterns: git-am"
level=warning msg="[po/zh_CN.po] >> msgid: It looks like 'git am' is in progress. Cannot rebase."
level=warning msg="[po/zh_CN.po] >> msgstr: 看起来 'git-am' 正在执行中。无法变基。"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: submodule.alternateLocaion, submodule.alternateLocation"
level=warning msg="[po/zh_CN.po] mismatched patterns: submodule.alternateLocaion, submodule.alternateLocation"
level=warning msg="[po/zh_CN.po] >> msgid: Value '%s' for submodule.alternateLocation is not recognized"
level=warning msg="[po/zh_CN.po] >> msgstr: 不能识别 submodule.alternateLocaion 的取值 '%s'"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: dimmed_zebra"
level=warning msg="[po/zh_CN.po] mismatched patterns: dimmed_zebra"
level=warning msg="[po/zh_CN.po] >> msgid: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
level=warning msg="[po/zh_CN.po] >> msgstr: 移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 'plain'"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: crlf_action"
level=warning msg="[po/zh_CN.po] mismatched patterns: crlf_action"
level=warning msg="[po/zh_CN.po] >> msgid: illegal crlf_action %d"
level=warning msg="[po/zh_CN.po] >> msgstr: 非法的 crlf 动作 %d"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --signed"
level=warning msg="[po/zh_CN.po] mismatched patterns: --signed"
level=warning msg="[po/zh_CN.po] >> msgid: not sending a push certificate since the receiving end does not support --signed push"
level=warning msg="[po/zh_CN.po] >> msgstr: 未发送推送证书，因为接收端不支持签名推送"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --type=bool"
level=warning msg="[po/zh_CN.po] mismatched patterns: --type=bool"
level=warning msg="[po/zh_CN.po] >> msgid: option `--default' expects a boolean value with `--type=bool`, not `%s`"
level=warning msg="[po/zh_CN.po] >> msgstr: 选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --type=ulong"
level=warning msg="[po/zh_CN.po] mismatched patterns: --type=ulong"
level=warning msg="[po/zh_CN.po] >> msgid: option `--default' expects an unsigned long value with `--type=ulong`, not `%s`"
level=warning msg="[po/zh_CN.po] >> msgstr: 选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不是 `%s`"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --atomic"
level=warning msg="[po/zh_CN.po] mismatched patterns: --atomic"
level=warning msg="[po/zh_CN.po] >> msgid: the receiving end does not support --atomic push"
level=warning msg="[po/zh_CN.po] >> msgstr: 接收端不支持原子推送"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: --signed"
level=warning msg="[po/zh_CN.po] mismatched patterns: --signed"
level=warning msg="[po/zh_CN.po] >> msgid: the receiving end does not support --signed push"
level=warning msg="[po/zh_CN.po] >> msgstr: 接收端不支持签名推送"
level=warning msg="[po/zh_CN.po]"
level=warning msg="[po/zh_CN.po] mismatch variable names: lasy_name, lazy_name"
level=warning msg="[po/zh_CN.po] mismatched patterns: lasy_name, lazy_name"
level=warning msg="[po/zh_CN.po] >> msgid: unable to join lazy_name thread: %s"
level=warning msg="[po/zh_CN.po] >> msgstr: 不能加入 lasy_name 线程：%s"
level=warning msg="[po/zh_CN.po]"
Expand Down
14 changes: 7 additions & 7 deletions test/t0033-typos-in-pt_PT.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,33 @@ cat >expect <<-\EOF
level=error msg="[po/pt_PT.po] 2876 translated messages, 1320 fuzzy translations, 842 untranslated messages."
level=error msg="[po/pt_PT.po] too many obsolete entries (225) in comments, please remove them"
------------------------------------------------------------------------------
level=warning msg="[po/pt_PT.po] mismatch variable names: --contains, --no-contains"
level=warning msg="[po/pt_PT.po] mismatched patterns: --contains, --no-contains"
level=warning msg="[po/pt_PT.po] >> msgid: --no-contains option is only allowed in list mode"
level=warning msg="[po/pt_PT.po] >> msgstr: a opção --contains só é permitida no modo lista"
level=warning msg="[po/pt_PT.po]"
level=warning msg="[po/pt_PT.po] mismatch variable names: --no-write-bitmap-index"
level=warning msg="[po/pt_PT.po] mismatched patterns: --no-write-bitmap-index"
level=warning msg="[po/pt_PT.po] >> msgid: Incremental repacks are incompatible with bitmap indexes. Use"
level=warning msg="[po/pt_PT.po] --no-write-bitmap-index or disable the pack.writebitmaps configuration."
level=warning msg="[po/pt_PT.po] >> msgstr: Repacks incrementais são incompatíveis com bitmap indexes. Usa"
level=warning msg="[po/pt_PT.po] --no-write-bitmap-índex ou desative a configuração pack.writebitmaps."
level=warning msg="[po/pt_PT.po]"
level=warning msg="[po/pt_PT.po] mismatch variable names: $n"
level=warning msg="[po/pt_PT.po] mismatched patterns: $n"
level=warning msg="[po/pt_PT.po] >> msgid: The commit message #${n} will be skipped:"
level=warning msg="[po/pt_PT.po] >> msgstr: A mensagem de commit nº${n} será ignorada:"
level=warning msg="[po/pt_PT.po]"
level=warning msg="[po/pt_PT.po] mismatch variable names: $n"
level=warning msg="[po/pt_PT.po] mismatched patterns: $n"
level=warning msg="[po/pt_PT.po] >> msgid: This is the commit message #${n}:"
level=warning msg="[po/pt_PT.po] >> msgstr: Esta é a mensagem de commit nº${n}:"
level=warning msg="[po/pt_PT.po]"
level=warning msg="[po/pt_PT.po] mismatch variable names: fetch.ouput, fetch.output"
level=warning msg="[po/pt_PT.po] mismatched patterns: fetch.ouput, fetch.output"
level=warning msg="[po/pt_PT.po] >> msgid: configuration fetch.output contains invalid value %s"
level=warning msg="[po/pt_PT.po] >> msgstr: a configuração fetch.ouput contém o valor inválido %s"
level=warning msg="[po/pt_PT.po]"
level=warning msg="[po/pt_PT.po] mismatch variable names: git-mailsplit"
level=warning msg="[po/pt_PT.po] mismatched patterns: git-mailsplit"
level=warning msg="[po/pt_PT.po] >> msgid: pass --keep-cr flag to git-mailsplit for mbox format"
level=warning msg="[po/pt_PT.po] >> msgstr: passar a opção --keep-cr ao gitmailsplit para formato de mbox"
level=warning msg="[po/pt_PT.po]"
level=warning msg="[po/pt_PT.po] mismatch variable names: %%(algn), %%(align)"
level=warning msg="[po/pt_PT.po] mismatched patterns: %%(algn), %%(align)"
level=warning msg="[po/pt_PT.po] >> msgid: positive width expected with the %%(align) atom"
level=warning msg="[po/pt_PT.po] >> msgstr: largura positiva esperada com o átomo %%(algn)"
level=warning msg="[po/pt_PT.po]"
Expand Down
Loading

0 comments on commit 3a7eb7b

Please sign in to comment.