diff --git a/test/t0031-check-typos-in-po.sh b/test/t0031-check-typos-in-po.sh
index 322ea52..b02d0b9 100755
--- a/test/t0031-check-typos-in-po.sh
+++ b/test/t0031-check-typos-in-po.sh
@@ -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]"
@@ -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]"
@@ -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]"
@@ -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]"
diff --git a/test/t0032-typos-in-zh_CN.sh b/test/t0032-typos-in-zh_CN.sh
index 01ac2d6..2211cfc 100755
--- a/test/t0032-typos-in-zh_CN.sh
+++ b/test/t0032-typos-in-zh_CN.sh
@@ -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]"
diff --git a/test/t0033-typos-in-pt_PT.sh b/test/t0033-typos-in-pt_PT.sh
index c2cb7c7..af2191c 100755
--- a/test/t0033-typos-in-pt_PT.sh
+++ b/test/t0033-typos-in-pt_PT.sh
@@ -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]"
diff --git a/test/t0034-typos-in-es.sh b/test/t0034-typos-in-es.sh
index 773f952..5ea2dc4 100755
--- a/test/t0034-typos-in-es.sh
+++ b/test/t0034-typos-in-es.sh
@@ -16,45 +16,45 @@ cat >expect <<-\EOF
 level=error msg="[po/es.po]    5104 translated messages."
 level=error msg="[po/es.po]    too many obsolete entries (235) in comments, please remove them"
 ------------------------------------------------------------------------------
-level=warning msg="[po/es.po]    mismatch variable names: herramienta.cmd"
+level=warning msg="[po/es.po]    mismatched patterns: herramienta.cmd"
 level=warning msg="[po/es.po]    >> msgid: '%s': path for unsupported man viewer."
 level=warning msg="[po/es.po]    Please consider using 'man.<tool>.cmd' instead."
 level=warning msg="[po/es.po]    >> msgstr: '%s': ruta para el visualizador del manual no soportada."
 level=warning msg="[po/es.po]    Por favor considere usar 'man.<herramienta.cmd'."
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --porcelain=2, --procelain=2"
+level=warning msg="[po/es.po]    mismatched patterns: --porcelain=2, --procelain=2"
 level=warning msg="[po/es.po]    >> msgid: 'git status --porcelain=2' failed in submodule %s"
 level=warning msg="[po/es.po]    >> msgstr: 'git status --procelain=2' falló en el submódulo %s"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --dir-diff, --dirty-diff"
+level=warning msg="[po/es.po]    mismatched patterns: --dir-diff, --dirty-diff"
 level=warning msg="[po/es.po]    >> msgid: --dir-diff is incompatible with --no-index"
 level=warning msg="[po/es.po]    >> msgstr: --dirty-diff es incompatible con --no-index"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: extensions.partialClone, extensions.partialclone"
+level=warning msg="[po/es.po]    mismatched patterns: extensions.partialClone, extensions.partialclone"
 level=warning msg="[po/es.po]    >> msgid: --filter can only be used with the remote configured in extensions.partialclone"
 level=warning msg="[po/es.po]    >> msgstr: --filter solo puede ser usado con el remoto configurado en extensions.partialClone"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --merge-base, --merge-baseson"
+level=warning msg="[po/es.po]    mismatched patterns: --merge-base, --merge-baseson"
 level=warning msg="[po/es.po]    >> msgid: --stdin and --merge-base are mutually exclusive"
 level=warning msg="[po/es.po]    >> msgstr: --stdin and --merge-baseson mutuamente exclusivas"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --porcelain=2, --procelain=2"
+level=warning msg="[po/es.po]    mismatched patterns: --porcelain=2, --procelain=2"
 level=warning msg="[po/es.po]    >> msgid: Could not run 'git status --porcelain=2' in submodule %s"
 level=warning msg="[po/es.po]    >> msgstr: No se pudo ejecutar 'git status --procelain=2' en el submódulo %s"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --shallow-exclude, --shalow-exclude"
+level=warning msg="[po/es.po]    mismatched patterns: --shallow-exclude, --shalow-exclude"
 level=warning msg="[po/es.po]    >> msgid: Server does not support --shallow-exclude"
 level=warning msg="[po/es.po]    >> msgstr: El servidor no soporta --shalow-exclude"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --shallow-since, --shalow-since"
+level=warning msg="[po/es.po]    mismatched patterns: --shallow-since, --shalow-since"
 level=warning msg="[po/es.po]    >> msgid: Server does not support --shallow-since"
 level=warning msg="[po/es.po]    >> msgstr: El servidor no soporta --shalow-since"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: ---smtp-debug, --smtp-debug"
+level=warning msg="[po/es.po]    mismatched patterns: ---smtp-debug, --smtp-debug"
 level=warning msg="[po/es.po]    >> msgid: Unable to initialize SMTP properly. Check config and use --smtp-debug."
 level=warning msg="[po/es.po]    >> msgstr: No es posible inicializar SMTP adecuadamente. Verificar config y usar ---smtp-debug."
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --allow-empty, --alow-empty"
+level=warning msg="[po/es.po]    mismatched patterns: --allow-empty, --alow-empty"
 level=warning msg="[po/es.po]    >> msgid: You asked to amend the most recent commit, but doing so would make"
 level=warning msg="[po/es.po]    it empty. You can repeat your command with --allow-empty, or you can"
 level=warning msg="[po/es.po]    remove the commit entirely with \"git reset HEAD^\"."
@@ -64,35 +64,35 @@ level=warning msg="[po/es.po]    vaciaría. Puedes repetir el comando con --alow
 level=warning msg="[po/es.po]    el commit completamente con \"git reset HEAD^\"."
 level=warning msg="[po/es.po]"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --filter, usar--filter"
+level=warning msg="[po/es.po]    mismatched patterns: --filter, usar--filter"
 level=warning msg="[po/es.po]    >> msgid: cannot use --filter without --stdout"
 level=warning msg="[po/es.po]    >> msgstr: no se puede usar--filter sin --stdout"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: dimmed_zebra"
+level=warning msg="[po/es.po]    mismatched patterns: dimmed_zebra"
 level=warning msg="[po/es.po]    >> msgid: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 level=warning msg="[po/es.po]    >> msgstr: opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra', 'plain'"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: gc.logexpirity, gc.logexpiry"
+level=warning msg="[po/es.po]    mismatched patterns: gc.logexpirity, gc.logexpiry"
 level=warning msg="[po/es.po]    >> msgid: failed to parse gc.logexpiry value %s"
 level=warning msg="[po/es.po]    >> msgstr: falló al analizar valor %s de gc.logexpirity"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: format.headers, formate.headers"
+level=warning msg="[po/es.po]    mismatched patterns: format.headers, formate.headers"
 level=warning msg="[po/es.po]    >> msgid: format.headers without value"
 level=warning msg="[po/es.po]    >> msgstr: formate.headers. sin valor"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: git-apply"
+level=warning msg="[po/es.po]    mismatched patterns: git-apply"
 level=warning msg="[po/es.po]    >> msgid: passed to 'git apply'"
 level=warning msg="[po/es.po]    >> msgstr: pasado a 'git-apply'"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: git-upload-archive, git-upload-archivo"
+level=warning msg="[po/es.po]    mismatched patterns: git-upload-archive, git-upload-archivo"
 level=warning msg="[po/es.po]    >> msgid: path to the remote git-upload-archive command"
 level=warning msg="[po/es.po]    >> msgstr: ruta para el comando git-upload-archivo remoto"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: %%(%s)"
+level=warning msg="[po/es.po]    mismatched patterns: %%(%s)"
 level=warning msg="[po/es.po]    >> msgid: positive value expected '%s' in %%(%s)"
 level=warning msg="[po/es.po]    >> msgstr: valor positivo esperado '%s' en %% (%s)"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --sateged, --staged"
+level=warning msg="[po/es.po]    mismatched patterns: --sateged, --staged"
 level=warning msg="[po/es.po]    >> msgid: repository has been updated, but unable to write"
 level=warning msg="[po/es.po]    new_index file. Check that disk is not full and quota is"
 level=warning msg="[po/es.po]    not exceeded, and then \"git restore --staged :/\" to recover."
@@ -100,35 +100,35 @@ level=warning msg="[po/es.po]    >> msgstr: el repositorio ha sido actualizado,
 level=warning msg="[po/es.po]    new_index. Verifique que el disco no este lleno y la quota no ha"
 level=warning msg="[po/es.po]    sido superada, y luego \"git restore --sateged :/\" para recuperar."
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: submodule--helper, subomdule--helper"
+level=warning msg="[po/es.po]    mismatched patterns: submodule--helper, subomdule--helper"
 level=warning msg="[po/es.po]    >> msgid: submodule--helper print-default-remote takes no arguments"
 level=warning msg="[po/es.po]    >> msgstr: subomdule--helper print-default-remote no toma argumentos"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --raw, --stat"
+level=warning msg="[po/es.po]    mismatched patterns: --raw, --stat"
 level=warning msg="[po/es.po]    >> msgid: synonym for '-p --raw'"
 level=warning msg="[po/es.po]    >> msgstr: sinónimo para '-p --stat'"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --abort, s--abort"
+level=warning msg="[po/es.po]    mismatched patterns: --abort, s--abort"
 level=warning msg="[po/es.po]    >> msgid: try \"git cherry-pick (--continue | %s--abort | --quit)\""
 level=warning msg="[po/es.po]    >> msgstr: intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --abort, s--abort"
+level=warning msg="[po/es.po]    mismatched patterns: --abort, s--abort"
 level=warning msg="[po/es.po]    >> msgid: try \"git revert (--continue | %s--abort | --quit)\""
 level=warning msg="[po/es.po]    >> msgstr: intenta \"git revert (--continue | --quit | %s --abort)\""
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: load_cache_entires, load_cache_entries"
+level=warning msg="[po/es.po]    mismatched patterns: load_cache_entires, load_cache_entries"
 level=warning msg="[po/es.po]    >> msgid: unable to join load_cache_entries thread: %s"
 level=warning msg="[po/es.po]    >> msgstr: no es posible unir hilo load_cache_entires: %s"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: %%(subject), %%(sujeto)"
+level=warning msg="[po/es.po]    mismatched patterns: %%(subject), %%(sujeto)"
 level=warning msg="[po/es.po]    >> msgid: unrecognized %%(subject) argument: %s"
 level=warning msg="[po/es.po]    >> msgstr: argumento %%(sujeto) no reconocido: %s"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --reference, usa--reference"
+level=warning msg="[po/es.po]    mismatched patterns: --reference, usa--reference"
 level=warning msg="[po/es.po]    >> msgid: use --reference only while cloning"
 level=warning msg="[po/es.po]    >> msgstr: usa--reference solamente si estás clonado"
 level=warning msg="[po/es.po]"
-level=warning msg="[po/es.po]    mismatch variable names: --group, --group=trailer"
+level=warning msg="[po/es.po]    mismatched patterns: --group, --group=trailer"
 level=warning msg="[po/es.po]    >> msgid: using --group=trailer with stdin is not supported"
 level=warning msg="[po/es.po]    >> msgstr: el uso de --group = trailer con stdin no es compatible"
 level=warning msg="[po/es.po]"
diff --git a/test/t0035-typos-in-vi.sh b/test/t0035-typos-in-vi.sh
index b97a8e6..7c5e2cf 100755
--- a/test/t0035-typos-in-vi.sh
+++ b/test/t0035-typos-in-vi.sh
@@ -16,7 +16,7 @@ cat >expect <<-\EOF
 level=error msg="[po/vi.po]    5104 translated messages."
 level=error msg="[po/vi.po]    too many obsolete entries (466) in comments, please remove them"
 ------------------------------------------------------------------------------
-level=warning msg="[po/vi.po]    mismatch variable names: --quiet"
+level=warning msg="[po/vi.po]    mismatched patterns: --quiet"
 level=warning msg="[po/vi.po]    >> msgid: "
 level=warning msg="[po/vi.po]    It took %.2f seconds to enumerate unstaged changes after reset. You can"
 level=warning msg="[po/vi.po]    use '--quiet' to avoid this. Set the config setting reset.quiet to true"
@@ -28,67 +28,67 @@ level=warning msg="[po/vi.po]    Bạn có thể sử dụng để tránh việc
 level=warning msg="[po/vi.po]    cài đặt config nếu bạn muốn thực hiện nó như là mặc định."
 level=warning msg="[po/vi.po]"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: $HOME"
+level=warning msg="[po/vi.po]    mismatched patterns: $HOME"
 level=warning msg="[po/vi.po]    >> msgid: $HOME not set"
 level=warning msg="[po/vi.po]    >> msgstr: Chưa đặt biến môi trường HOME"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --contents"
+level=warning msg="[po/vi.po]    mismatched patterns: --contents"
 level=warning msg="[po/vi.po]    >> msgid: --contents and --reverse do not blend well."
 level=warning msg="[po/vi.po]    >> msgstr: tùy chọn--contents và --reverse không được trộn vào nhau."
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --deepen"
+level=warning msg="[po/vi.po]    mismatched patterns: --deepen"
 level=warning msg="[po/vi.po]    >> msgid: --deepen and --depth are mutually exclusive"
 level=warning msg="[po/vi.po]    >> msgstr: Các tùy chọn--deepen và --depth loại từ lẫn nhau"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --long"
+level=warning msg="[po/vi.po]    mismatched patterns: --long"
 level=warning msg="[po/vi.po]    >> msgid: --long and -z are incompatible"
 level=warning msg="[po/vi.po]    >> msgstr: hai tùy chọn -long và -z không tương thích với nhau"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --stdout"
+level=warning msg="[po/vi.po]    mismatched patterns: --stdout"
 level=warning msg="[po/vi.po]    >> msgid: --stdout, --output, and --output-directory are mutually exclusive"
 level=warning msg="[po/vi.po]    >> msgstr: Các tùy chọn--stdout, --output, và --output-directory loại từ lẫn nhau"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: git-am"
+level=warning msg="[po/vi.po]    mismatched patterns: git-am"
 level=warning msg="[po/vi.po]    >> msgid: It looks like 'git am' is in progress. Cannot rebase."
 level=warning msg="[po/vi.po]    >> msgstr: Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase."
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: add_cacheinfo, addinfo_cache"
+level=warning msg="[po/vi.po]    mismatched patterns: add_cacheinfo, addinfo_cache"
 level=warning msg="[po/vi.po]    >> msgid: add_cacheinfo failed for path '%s'; merge aborting."
 level=warning msg="[po/vi.po]    >> msgstr: addinfo_cache gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: add_cacheinfo, addinfo_cache"
+level=warning msg="[po/vi.po]    mismatched patterns: add_cacheinfo, addinfo_cache"
 level=warning msg="[po/vi.po]    >> msgid: add_cacheinfo failed to refresh for path '%s'; merge aborting."
 level=warning msg="[po/vi.po]    >> msgstr: addinfo_cache gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: dimmed_zebra"
+level=warning msg="[po/vi.po]    mismatched patterns: dimmed_zebra"
 level=warning msg="[po/vi.po]    >> msgid: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 level=warning msg="[po/vi.po]    >> msgstr: cài đặt màu đã di chuyển phải là một trong “no”, “default”, “blocks”, “zebra”, “dimmed_zebra”, “plain”"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --bisect-reset, --bisect-state"
+level=warning msg="[po/vi.po]    mismatched patterns: --bisect-reset, --bisect-state"
 level=warning msg="[po/vi.po]    >> msgid: git bisect--helper --bisect-state (good|old) [<rev>...]"
 level=warning msg="[po/vi.po]    >> msgstr: git bisect--helper --bisect-reset (good|old) [<lần_chuyển_giao>…]"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --url"
+level=warning msg="[po/vi.po]    mismatched patterns: --url"
 level=warning msg="[po/vi.po]    >> msgid: git submodule--helper clone [--prefix=<path>] [--quiet] [--reference <repository>] [--name <name>] [--depth <depth>] [--single-branch] --url <url> --path <path>"
 level=warning msg="[po/vi.po]    >> msgstr: git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference <kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--url <url>] --path </đường/dẫn>"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: --decorate"
+level=warning msg="[po/vi.po]    mismatched patterns: --decorate"
 level=warning msg="[po/vi.po]    >> msgid: invalid --decorate option: %s"
 level=warning msg="[po/vi.po]    >> msgstr: tùy chọn--decorate không hợp lệ: %s"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: submodule.fetchJobs, submodule.fetchjobs"
+level=warning msg="[po/vi.po]    mismatched patterns: submodule.fetchJobs, submodule.fetchjobs"
 level=warning msg="[po/vi.po]    >> msgid: negative values not allowed for submodule.fetchjobs"
 level=warning msg="[po/vi.po]    >> msgstr: không cho phép giá trị âm ở submodule.fetchJobs"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: git-upload-archive, git-upload-pack"
+level=warning msg="[po/vi.po]    mismatched patterns: git-upload-archive, git-upload-pack"
 level=warning msg="[po/vi.po]    >> msgid: path to the remote git-upload-archive command"
 level=warning msg="[po/vi.po]    >> msgstr: đường dẫn đến lệnh git-upload-pack trên máy chủ"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: %%(objectname), %%(objectsize)"
+level=warning msg="[po/vi.po]    mismatched patterns: %%(objectname), %%(objectsize)"
 level=warning msg="[po/vi.po]    >> msgid: unrecognized %%(objectsize) argument: %s"
 level=warning msg="[po/vi.po]    >> msgstr: tham số không được thừa nhận %%(objectname): %s"
 level=warning msg="[po/vi.po]"
-level=warning msg="[po/vi.po]    mismatch variable names: %%(color:%s), %%(màu:%s)"
+level=warning msg="[po/vi.po]    mismatched patterns: %%(color:%s), %%(màu:%s)"
 level=warning msg="[po/vi.po]    >> msgid: unrecognized color: %%(color:%s)"
 level=warning msg="[po/vi.po]    >> msgstr: không nhận ra màu: %%(màu:%s)"
 level=warning msg="[po/vi.po]"
diff --git a/test/t0036-typos-in-sv.sh b/test/t0036-typos-in-sv.sh
index 914d5ae..b19d6f1 100755
--- a/test/t0036-typos-in-sv.sh
+++ b/test/t0036-typos-in-sv.sh
@@ -16,29 +16,29 @@ cat >expect <<-\EOF
 level=error msg="[po/sv.po]    5104 translated messages."
 level=error msg="[po/sv.po]    too many obsolete entries (475) in comments, please remove them"
 ------------------------------------------------------------------------------
-level=warning msg="[po/sv.po]    mismatch variable names: --chmod, --chmod-parametern"
+level=warning msg="[po/sv.po]    mismatched patterns: --chmod, --chmod-parametern"
 level=warning msg="[po/sv.po]    >> msgid: --chmod param '%s' must be either -x or +x"
 level=warning msg="[po/sv.po]    >> msgstr: --chmod-parametern \"%s\" måste antingen vara -x eller +x"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --dump-alias, --dump-aliases"
+level=warning msg="[po/sv.po]    mismatched patterns: --dump-alias, --dump-aliases"
 level=warning msg="[po/sv.po]    >> msgid: --dump-aliases incompatible with other options"
 level=warning msg="[po/sv.po]"
 level=warning msg="[po/sv.po]    >> msgstr: --dump-alias är inkompatibelt med andra flaggor"
 level=warning msg="[po/sv.po]"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --unpack-unreachable"
+level=warning msg="[po/sv.po]    mismatched patterns: --unpack-unreachable"
 level=warning msg="[po/sv.po]    >> msgid: --keep-unreachable and --unpack-unreachable are incompatible"
 level=warning msg="[po/sv.po]    >> msgstr: --keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --check"
+level=warning msg="[po/sv.po]    mismatched patterns: --check"
 level=warning msg="[po/sv.po]    >> msgid: --name-only, --name-status, --check and -s are mutually exclusive"
 level=warning msg="[po/sv.po]    >> msgstr: --name-only, --name-status, -check och -s är ömsesidigt uteslutande"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --separate-git-dir, --separatebgit-dir"
+level=warning msg="[po/sv.po]    mismatched patterns: --separate-git-dir, --separatebgit-dir"
 level=warning msg="[po/sv.po]    >> msgid: --separate-git-dir incompatible with bare repository"
 level=warning msg="[po/sv.po]    >> msgstr: --separatebgit-dir är inkompatibelt med naket arkiv"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --source=HEAD"
+level=warning msg="[po/sv.po]    mismatched patterns: --source=HEAD"
 level=warning msg="[po/sv.po]    >> msgid: Clone succeeded, but checkout failed."
 level=warning msg="[po/sv.po]    You can inspect what was checked out with 'git status'"
 level=warning msg="[po/sv.po]    and retry with 'git restore --source=HEAD :/'"
@@ -48,55 +48,55 @@ level=warning msg="[po/sv.po]    Du kan inspektera det som checkades ut med \"gi
 level=warning msg="[po/sv.po]    och försöka med \"git restore -source=HEAD :/\""
 level=warning msg="[po/sv.po]"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: add_cacheinfo, add_cahceinfo"
+level=warning msg="[po/sv.po]    mismatched patterns: add_cacheinfo, add_cahceinfo"
 level=warning msg="[po/sv.po]    >> msgid: add_cacheinfo failed for path '%s'; merge aborting."
 level=warning msg="[po/sv.po]    >> msgstr: add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: dimmed_zebra"
+level=warning msg="[po/sv.po]    mismatched patterns: dimmed_zebra"
 level=warning msg="[po/sv.po]    >> msgid: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 level=warning msg="[po/sv.po]    >> msgstr: färginställningen för flyttade block måste vara en av \"no\", \"default\", \"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: %%(trailers:key=<...>), %%(trailers:nyckel=<...>)"
+level=warning msg="[po/sv.po]    mismatched patterns: %%(trailers:key=<...>), %%(trailers:nyckel=<...>)"
 level=warning msg="[po/sv.po]    >> msgid: expected %%(trailers:key=<value>)"
 level=warning msg="[po/sv.po]    >> msgstr: förvändate %%(trailers:nyckel=<värde>)"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: git bisect--helper, git-bisect--helper"
+level=warning msg="[po/sv.po]    mismatched patterns: git bisect--helper, git-bisect--helper"
 level=warning msg="[po/sv.po]    >> msgid: git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"
 level=warning msg="[po/sv.po]    >> msgstr: git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: git fetch-pack, git fetch-patch"
+level=warning msg="[po/sv.po]    mismatched patterns: git fetch-pack, git fetch-patch"
 level=warning msg="[po/sv.po]    >> msgid: git fetch-pack: fetch failed."
 level=warning msg="[po/sv.po]    >> msgstr: git fetch-patch: hämtning misslyckades."
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: git-dir, git-dirs"
+level=warning msg="[po/sv.po]    mismatched patterns: git-dir, git-dirs"
 level=warning msg="[po/sv.po]    >> msgid: git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 level=warning msg="[po/sv.po]    >> msgstr: git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --branch, --brand"
+level=warning msg="[po/sv.po]    mismatched patterns: --branch, --brand"
 level=warning msg="[po/sv.po]    >> msgid: git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 level=warning msg="[po/sv.po]    >> msgstr: git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --format="
+level=warning msg="[po/sv.po]    mismatched patterns: --format="
 level=warning msg="[po/sv.po]    >> msgid: git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 level=warning msg="[po/sv.po]    >> msgstr: git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: splitIndex.maxPercentChange, splitIndex.maxPercentage"
+level=warning msg="[po/sv.po]    mismatched patterns: splitIndex.maxPercentChange, splitIndex.maxPercentage"
 level=warning msg="[po/sv.po]    >> msgid: splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 level=warning msg="[po/sv.po]    >> msgstr: värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: cache_entries, load_cache_entries"
+level=warning msg="[po/sv.po]    mismatched patterns: cache_entries, load_cache_entries"
 level=warning msg="[po/sv.po]    >> msgid: unable to create load_cache_entries thread: %s"
 level=warning msg="[po/sv.po]    >> msgstr: kunde inte läsa in cache_entries-tråden: %s"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: cache_entries, load_cache_entries"
+level=warning msg="[po/sv.po]    mismatched patterns: cache_entries, load_cache_entries"
 level=warning msg="[po/sv.po]    >> msgid: unable to join load_cache_entries thread: %s"
 level=warning msg="[po/sv.po]    >> msgstr: kunde inte utföra join på cache_entries-tråden: %s"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --stdin-commit, --stdin-commits"
+level=warning msg="[po/sv.po]    mismatched patterns: --stdin-commit, --stdin-commits"
 level=warning msg="[po/sv.po]    >> msgid: use at most one of --reachable, --stdin-commits, or --stdin-packs"
 level=warning msg="[po/sv.po]    >> msgstr: använd som mest en av --reachable, --stdin-commit och --stdin-packs"
 level=warning msg="[po/sv.po]"
-level=warning msg="[po/sv.po]    mismatch variable names: --group, --group-flagga"
+level=warning msg="[po/sv.po]    mismatched patterns: --group, --group-flagga"
 level=warning msg="[po/sv.po]    >> msgid: using multiple --group options with stdin is not supported"
 level=warning msg="[po/sv.po]    >> msgstr: mer än en --group-flagga stöds inte med standard in"
 level=warning msg="[po/sv.po]"
diff --git a/test/t0037-typos-in-bg.sh b/test/t0037-typos-in-bg.sh
index 8db00a2..7581941 100755
--- a/test/t0037-typos-in-bg.sh
+++ b/test/t0037-typos-in-bg.sh
@@ -15,51 +15,51 @@ cat >expect <<-\EOF
 ------------------------------------------------------------------------------
 level=info msg="[po/bg.po]    5104 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/bg.po]    mismatch variable names: $HOME"
+level=warning msg="[po/bg.po]    mismatched patterns: $HOME"
 level=warning msg="[po/bg.po]    >> msgid: $HOME not set"
 level=warning msg="[po/bg.po]    >> msgstr: променливата „HOME“ не е зададена"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --abort"
+level=warning msg="[po/bg.po]    mismatched patterns: --abort"
 level=warning msg="[po/bg.po]    >> msgid: --abort but leave index and working tree alone"
 level=warning msg="[po/bg.po]    >> msgstr: преустановяване без промяна на индекса и работното дърво"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --contains"
+level=warning msg="[po/bg.po]    mismatched patterns: --contains"
 level=warning msg="[po/bg.po]    >> msgid: --contains option is only allowed in list mode"
 level=warning msg="[po/bg.po]    >> msgstr: Опцията „-contains“ изисква режим на списък."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: extensions.partialClone, extensions.partialclone"
+level=warning msg="[po/bg.po]    mismatched patterns: extensions.partialClone, extensions.partialclone"
 level=warning msg="[po/bg.po]    >> msgid: --filter can only be used with the remote configured in extensions.partialclone"
 level=warning msg="[po/bg.po]    >> msgstr: опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в настройката „extensions.partialClone“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --no-contains"
+level=warning msg="[po/bg.po]    mismatched patterns: --no-contains"
 level=warning msg="[po/bg.po]    >> msgid: --no-contains option is only allowed in list mode"
 level=warning msg="[po/bg.po]    >> msgstr: Опцията „-contains“ изисква режим на списък."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --cached, --no-index"
+level=warning msg="[po/bg.po]    mismatched patterns: --cached, --no-index"
 level=warning msg="[po/bg.po]    >> msgid: --no-index or --untracked cannot be used with revs"
 level=warning msg="[po/bg.po]    >> msgstr: опциите „--cached“ и „--untracked“ са несъвместими с версии."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --points-at"
+level=warning msg="[po/bg.po]    mismatched patterns: --points-at"
 level=warning msg="[po/bg.po]    >> msgid: --points-at option is only allowed in list mode"
 level=warning msg="[po/bg.po]    >> msgstr: Опцията „-points-at“ изисква режим на списък."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --reflog, --track"
+level=warning msg="[po/bg.po]    mismatched patterns: --reflog, --track"
 level=warning msg="[po/bg.po]    >> msgid: --reflog option needs one branch name"
 level=warning msg="[po/bg.po]    >> msgstr: опцията „--track“ изисква точно едно име на клон"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --stdin"
+level=warning msg="[po/bg.po]    mismatched patterns: --stdin"
 level=warning msg="[po/bg.po]    >> msgid: --stdin and --merge-base are mutually exclusive"
 level=warning msg="[po/bg.po]    >> msgstr: опциите „-stdin“ и „--merge-base“ са несъвместими"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --rfc"
+level=warning msg="[po/bg.po]    mismatched patterns: --rfc"
 level=warning msg="[po/bg.po]    >> msgid: --subject-prefix/--rfc and -k are mutually exclusive"
 level=warning msg="[po/bg.po]    >> msgstr: опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --name-only, --only-input"
+level=warning msg="[po/bg.po]    mismatched patterns: --name-only, --only-input"
 level=warning msg="[po/bg.po]    >> msgid: --trailer with --only-input does not make sense"
 level=warning msg="[po/bg.po]    >> msgstr: опцията „--trailer“ е несъвместима с „--name-only“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --worktre, --worktree"
+level=warning msg="[po/bg.po]    mismatched patterns: --worktre, --worktree"
 level=warning msg="[po/bg.po]    >> msgid: --worktree cannot be used with multiple working trees unless the config"
 level=warning msg="[po/bg.po]    extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\""
 level=warning msg="[po/bg.po]    section in \"git help worktree\" for details"
@@ -68,13 +68,13 @@ level=warning msg="[po/bg.po]    включването на разширени
 level=warning msg="[po/bg.po]    повече информация вижте раздела „CONFIGURATION FILE“ в"
 level=warning msg="[po/bg.po]    „git help worktree“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --no-commit"
+level=warning msg="[po/bg.po]    mismatched patterns: --no-commit"
 level=warning msg="[po/bg.po]    >> msgid: Automatic merge went well; stopped before committing as requested"
 level=warning msg="[po/bg.po]"
 level=warning msg="[po/bg.po]    >> msgstr: Автоматичното сливане завърши успешно. Самото подаване не е извършено, защото бе зададена опцията „--no-commit“."
 level=warning msg="[po/bg.po]"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: $BRANCH, $br"
+level=warning msg="[po/bg.po]    mismatched patterns: $BRANCH, $br"
 level=warning msg="[po/bg.po]    >> msgid: Git normally never creates a ref that ends with 40 hex characters"
 level=warning msg="[po/bg.po]    because it will be ignored when you just specify 40-hex. These refs"
 level=warning msg="[po/bg.po]    may be created by mistake. For example,"
@@ -96,143 +96,143 @@ level=warning msg="[po/bg.po]    За да изключите това съоб
 level=warning msg="[po/bg.po]"
 level=warning msg="[po/bg.po]     git config advice.objectNameWarning false"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: git-am"
+level=warning msg="[po/bg.po]    mismatched patterns: git-am"
 level=warning msg="[po/bg.po]    >> msgid: It looks like 'git am' is in progress. Cannot rebase."
 level=warning msg="[po/bg.po]    >> msgstr: Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да пребазирате в момента."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --no-ff"
+level=warning msg="[po/bg.po]    mismatched patterns: --no-ff"
 level=warning msg="[po/bg.po]    >> msgid: Non-fast-forward commit does not make sense into an empty head"
 level=warning msg="[po/bg.po]    >> msgstr: Понеже върхът е без история, всички сливания са превъртания, не може да се извърши същинско сливане изисквано от опцията „--no-ff“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --filter, --stdout"
+level=warning msg="[po/bg.po]    mismatched patterns: --filter, --stdout"
 level=warning msg="[po/bg.po]    >> msgid: cannot use --filter without --stdout"
 level=warning msg="[po/bg.po]    >> msgstr: опцията „-filter“ изисква „-stdout“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: dimmed_zebra"
+level=warning msg="[po/bg.po]    mismatched patterns: dimmed_zebra"
 level=warning msg="[po/bg.po]    >> msgid: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 level=warning msg="[po/bg.po]    >> msgstr: настройката за цвят за преместване трябва да е една от: „no“ (без), „default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed_zebra“ (тъмно райе), „plain“ (обикновено)"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: conclude_pack, vger.kernel.org"
+level=warning msg="[po/bg.po]    mismatched patterns: conclude_pack, vger.kernel.org"
 level=warning msg="[po/bg.po]    >> msgid: confusion beyond insanity"
 level=warning msg="[po/bg.po]    >> msgstr: фатална грешка във функцията „conclude_pack“. Това е грешка в Git, докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: vger.kernel.org"
+level=warning msg="[po/bg.po]    mismatched patterns: vger.kernel.org"
 level=warning msg="[po/bg.po]    >> msgid: confusion beyond insanity in parse_pack_objects()"
 level=warning msg="[po/bg.po]    >> msgstr: фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger.kernel.org“."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: credential-cache--daemon"
+level=warning msg="[po/bg.po]    mismatched patterns: credential-cache--daemon"
 level=warning msg="[po/bg.po]    >> msgid: credential-cache--daemon unavailable; no unix socket support"
 level=warning msg="[po/bg.po]    >> msgstr: демонът за кеша с идентификациите е недостъпен — липсва поддръжка на гнезда на unix"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: %%(trailers:key=), %%(trailers:КЛЮЧ=)"
+level=warning msg="[po/bg.po]    mismatched patterns: %%(trailers:key=), %%(trailers:КЛЮЧ=)"
 level=warning msg="[po/bg.po]    >> msgid: expected %%(trailers:key=<value>)"
 level=warning msg="[po/bg.po]    >> msgstr: очаква се %%(trailers:КЛЮЧ=СТОЙНОСТ)"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --quit, --skip"
+level=warning msg="[po/bg.po]    mismatched patterns: --quit, --skip"
 level=warning msg="[po/bg.po]    >> msgid: git am [<options>] (--continue | --skip | --abort)"
 level=warning msg="[po/bg.po]    >> msgstr: git am [ОПЦИЯ…] (--continue | --quit | --abort)"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --bisect-next, --bisect-replay"
+level=warning msg="[po/bg.po]    mismatched patterns: --bisect-next, --bisect-replay"
 level=warning msg="[po/bg.po]    >> msgid: git bisect--helper --bisect-replay <filename>"
 level=warning msg="[po/bg.po]    >> msgstr: git bisect--helper --bisect-next ИМЕ_НА_ФАЙЛ"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --bisect-reset, --bisect-skip"
+level=warning msg="[po/bg.po]    mismatched patterns: --bisect-reset, --bisect-skip"
 level=warning msg="[po/bg.po]    >> msgid: git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 level=warning msg="[po/bg.po]    >> msgstr: git bisect--helper --bisect-reset [(ВЕРСИЯ|ДИАПАЗОН)…]"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --bisect-reset, --bisect-state"
+level=warning msg="[po/bg.po]    mismatched patterns: --bisect-reset, --bisect-state"
 level=warning msg="[po/bg.po]    >> msgid: git bisect--helper --bisect-state (bad|new) [<rev>]"
 level=warning msg="[po/bg.po]    >> msgstr: git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --bisect-reset, --bisect-state"
+level=warning msg="[po/bg.po]    mismatched patterns: --bisect-reset, --bisect-state"
 level=warning msg="[po/bg.po]    >> msgid: git bisect--helper --bisect-state (good|old) [<rev>...]"
 level=warning msg="[po/bg.po]    >> msgstr: git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: _git_rev"
+level=warning msg="[po/bg.po]    mismatched patterns: _git_rev"
 level=warning msg="[po/bg.po]    >> msgid: git bundle create [<options>] <file> <git-rev-list args>"
 level=warning msg="[po/bg.po]    >> msgstr: git bundle create [ОПЦИЯ…] ФАЙЛ АРГУМЕНТ_ЗА_git_rev-list…"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: git upload-pack, git upload-repack"
+level=warning msg="[po/bg.po]    mismatched patterns: git upload-pack, git upload-repack"
 level=warning msg="[po/bg.po]    >> msgid: git upload-pack [<options>] <dir>"
 level=warning msg="[po/bg.po]    >> msgstr: git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: git verify-commit, git verify-tag"
+level=warning msg="[po/bg.po]    mismatched patterns: git verify-commit, git verify-tag"
 level=warning msg="[po/bg.po]    >> msgid: git verify-commit [-v | --verbose] <commit>..."
 level=warning msg="[po/bg.po]    >> msgstr: git verify-tag [-v | --verbose] ПОДАВАНЕ…"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --force"
+level=warning msg="[po/bg.po]    mismatched patterns: --force"
 level=warning msg="[po/bg.po]    >> msgid: helper %s does not support 'force'"
 level=warning msg="[po/bg.po]    >> msgstr: насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: crlf_action"
+level=warning msg="[po/bg.po]    mismatched patterns: crlf_action"
 level=warning msg="[po/bg.po]    >> msgid: illegal crlf_action %d"
 level=warning msg="[po/bg.po]    >> msgstr: неправилно действие за край на ред: %d"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: s.merge"
+level=warning msg="[po/bg.po]    mismatched patterns: s.merge"
 level=warning msg="[po/bg.po]    >> msgid: invalid branch.%s.merge; cannot rebase onto > 1 branch"
 level=warning msg="[po/bg.po]    >> msgstr: неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече от 1 клон"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: run_command"
+level=warning msg="[po/bg.po]    mismatched patterns: run_command"
 level=warning msg="[po/bg.po]    >> msgid: run_command returned non-zero status for %s"
 level=warning msg="[po/bg.po]    ."
 level=warning msg="[po/bg.po]    >> msgstr: изпълнената команда завърши с ненулев изход за „%s“"
 level=warning msg="[po/bg.po]    ."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: run_command"
+level=warning msg="[po/bg.po]    mismatched patterns: run_command"
 level=warning msg="[po/bg.po]    >> msgid: run_command returned non-zero status while recursing in the nested submodules of %s"
 level=warning msg="[po/bg.po]    ."
 level=warning msg="[po/bg.po]    >> msgstr: изпълнената команда завърши с ненулев изход при обхождане на подмодулите, вложени в „%s“"
 level=warning msg="[po/bg.po]    ."
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --raw, --stat"
+level=warning msg="[po/bg.po]    mismatched patterns: --raw, --stat"
 level=warning msg="[po/bg.po]    >> msgid: synonym for '-p --raw'"
 level=warning msg="[po/bg.po]    >> msgstr: псевдоним на „-p --stat“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --dirstat=, --dirstat=files"
+level=warning msg="[po/bg.po]    mismatched patterns: --dirstat=, --dirstat=files"
 level=warning msg="[po/bg.po]    >> msgid: synonym for --dirstat=files,param1,param2..."
 level=warning msg="[po/bg.po]    >> msgstr: псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: git cherry-pick"
+level=warning msg="[po/bg.po]    mismatched patterns: git cherry-pick"
 level=warning msg="[po/bg.po]    >> msgid: try \"git revert (--continue | %s--abort | --quit)\""
 level=warning msg="[po/bg.po]    >> msgstr: използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: lazy_dir"
+level=warning msg="[po/bg.po]    mismatched patterns: lazy_dir"
 level=warning msg="[po/bg.po]    >> msgid: unable to create lazy_dir thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се създаде нишка за директории: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: lazy_name"
+level=warning msg="[po/bg.po]    mismatched patterns: lazy_name"
 level=warning msg="[po/bg.po]    >> msgid: unable to create lazy_name thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се създаде нишка за имена: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: load_cache_entries"
+level=warning msg="[po/bg.po]    mismatched patterns: load_cache_entries"
 level=warning msg="[po/bg.po]    >> msgid: unable to create load_cache_entries thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се създаде нишка за зареждане на обектите от кеша: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: load_index_extensions"
+level=warning msg="[po/bg.po]    mismatched patterns: load_index_extensions"
 level=warning msg="[po/bg.po]    >> msgid: unable to create load_index_extensions thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се създаде нишка за зареждане на разширенията на индекса: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: lazy_name"
+level=warning msg="[po/bg.po]    mismatched patterns: lazy_name"
 level=warning msg="[po/bg.po]    >> msgid: unable to join lazy_name thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се изчака нишка за имена: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: load_cache_entries"
+level=warning msg="[po/bg.po]    mismatched patterns: load_cache_entries"
 level=warning msg="[po/bg.po]    >> msgid: unable to join load_cache_entries thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се изчака нишка за зареждане на обектите от кеша: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: load_index_extensions"
+level=warning msg="[po/bg.po]    mismatched patterns: load_index_extensions"
 level=warning msg="[po/bg.po]    >> msgid: unable to join load_index_extensions thread: %s"
 level=warning msg="[po/bg.po]    >> msgstr: не може да се създаде нишка за зареждане на разширенията на индекса: %s"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: new_index"
+level=warning msg="[po/bg.po]    mismatched patterns: new_index"
 level=warning msg="[po/bg.po]    >> msgid: unable to write new_index file"
 level=warning msg="[po/bg.po]    >> msgstr: новият индекс не може да бъде записан"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: --patch"
+level=warning msg="[po/bg.po]    mismatched patterns: --patch"
 level=warning msg="[po/bg.po]    >> msgid: unknown --patch mode: %s"
 level=warning msg="[po/bg.po]    >> msgstr: неизвестна стратегия за прилагане на кръпка: „%s“"
 level=warning msg="[po/bg.po]"
-level=warning msg="[po/bg.po]    mismatch variable names: update_ref"
+level=warning msg="[po/bg.po]    mismatched patterns: update_ref"
 level=warning msg="[po/bg.po]    >> msgid: update_ref failed for ref '%s': %s"
 level=warning msg="[po/bg.po]    >> msgstr: неуспешно обновяване на указателя „%s“: %s"
 level=warning msg="[po/bg.po]"
@@ -249,7 +249,7 @@ test_expect_success "still has typos in master branch" '
 	test_must_fail git -C workdir $HELPER \
 		check-po --report-typos=error bg >actual 2>&1 &&
 	cat >expect <<-EOF &&
-		ERROR [po/bg.po]        mismatch variable names: _git_rev 
+		ERROR [po/bg.po]        mismatched patterns: _git_rev 
 		ERROR [po/bg.po]        >> msgid: git bundle create [<options>] <file> <git-rev-list args> 
 		ERROR [po/bg.po]        >> msgstr: git bundle create [ОПЦИЯ…] ФАЙЛ АРГУМЕНТ_ЗА_git_rev-list… 
 		ERROR [po/bg.po]
diff --git a/test/t0041-check-commits-with-typos.sh b/test/t0041-check-commits-with-typos.sh
index 6cf98e1..79b2211 100755
--- a/test/t0041-check-commits-with-typos.sh
+++ b/test/t0041-check-commits-with-typos.sh
@@ -56,11 +56,11 @@ cat >expect <<-\EOF
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=warning msg="[po/zh_CN.po@rev]"
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=warning msg="[po/zh_CN.po@rev]"
@@ -80,11 +80,11 @@ cat >expect <<-\EOF
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=error msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=error msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=error msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=error msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=error msg="[po/zh_CN.po@rev]"
-level=error msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=error msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=error msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=error msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=error msg="[po/zh_CN.po@rev]"
@@ -121,11 +121,11 @@ level=warning msg="commit <OID>: author (A U Thor <author@example.com>) and comm
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=warning msg="[po/zh_CN.po@rev]"
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=warning msg="[po/zh_CN.po@rev]"
diff --git a/test/t0042-check-commits-in-bare-repo.sh b/test/t0042-check-commits-in-bare-repo.sh
index ecda765..186398b 100755
--- a/test/t0042-check-commits-in-bare-repo.sh
+++ b/test/t0042-check-commits-in-bare-repo.sh
@@ -58,11 +58,11 @@ cat >expect <<-\EOF
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=warning msg="[po/zh_CN.po@rev]"
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=warning msg="[po/zh_CN.po@rev]"
@@ -81,11 +81,11 @@ cat >expect <<-\EOF
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=error msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=error msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=error msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=error msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=error msg="[po/zh_CN.po@rev]"
-level=error msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=error msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=error msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=error msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=error msg="[po/zh_CN.po@rev]"
@@ -124,11 +124,11 @@ level=warning msg="commit <OID>: author (A U Thor <author@example.com>) and comm
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=warning msg="[po/zh_CN.po@rev]"
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=warning msg="[po/zh_CN.po@rev]"
diff --git a/test/t0043-check-commits-in-partial-clone.sh b/test/t0043-check-commits-in-partial-clone.sh
index 85ce28d..cc7a8d1 100755
--- a/test/t0043-check-commits-in-partial-clone.sh
+++ b/test/t0043-check-commits-in-partial-clone.sh
@@ -81,11 +81,11 @@ cat >expect <<-\EOF
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=warning msg="[po/zh_CN.po@rev]"
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=warning msg="[po/zh_CN.po@rev]"
@@ -106,11 +106,11 @@ level=info msg="no missing blobs of po/* in partial clone"
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=error msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=error msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=error msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=error msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=error msg="[po/zh_CN.po@rev]"
-level=error msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=error msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=error msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=error msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=error msg="[po/zh_CN.po@rev]"
@@ -149,11 +149,11 @@ level=warning msg="commit <OID>: author (A U Thor <author@example.com>) and comm
 ------------------------------------------------------------------------------
 level=info msg="[po/zh_CN.po@rev]    2 translated messages."
 ------------------------------------------------------------------------------
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $branch, $remote_name, $sm_path, sm_path"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $branch, $remote_name, $sm_path, sm_path"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: Unable to find current ${remote_name}/${branch} revision in submodule path ${sm_path}"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 无法在子模块路径 sm_path 中找到当前的 远程/分支 版本"
 level=warning msg="[po/zh_CN.po@rev]"
-level=warning msg="[po/zh_CN.po@rev]    mismatch variable names: $command, $res"
+level=warning msg="[po/zh_CN.po@rev]    mismatched patterns: $command, $res"
 level=warning msg="[po/zh_CN.po@rev]    >> msgid: exit code $res from $command is < 0 or >= 128"
 level=warning msg="[po/zh_CN.po@rev]    >> msgstr: 命令的退出码res 应该 < 0 或 >= 128"
 level=warning msg="[po/zh_CN.po@rev]"
diff --git a/util/check-po-typos.go b/util/check-po-typos.go
index c8c1430..ffc9eed 100644
--- a/util/check-po-typos.go
+++ b/util/check-po-typos.go
@@ -258,7 +258,7 @@ func checkTyposInPoEntry(locale, msgID, msgStr string) ([]string, bool) {
 	mismatched = findMismatchedVariables(locale, msgID, msgStr)
 	if len(mismatched) > 0 {
 		msgs = append(msgs,
-			fmt.Sprintf("mismatch variable names: %s",
+			fmt.Sprintf("mismatched patterns: %s",
 				strings.Join(mismatched, ", ")))
 		msgs = append(msgs, fmt.Sprintf(">> msgid: %s", origMsgID))
 		msgs = append(msgs, fmt.Sprintf(">> msgstr: %s", origMsgStr))