l10n: fixed tripple-letter typos
Andrei found that the word "shallow" has an extra letter "l" in "po/zh_CN.po". There are similar typos in other l10n files.
--- po/README.md | 2 +- po/es.po | 4 ++-- po/fr.po | 2 +- po/sv.po | 2 +- po/zh_CN.po | 6 +++--- po/zh_TW.po | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-)
po/README.md +1 -1
@@ -392,7 +392,7 @@ additional conventions: git-po-helper init --core <your-language> 3. Add a new entry in the "po/TEAMS" file with proper format, and check - the syntax of "po/TEAMS" by runnning the following command: + the syntax of "po/TEAMS" by running the following command: git-po-helper team --check
po/es.po +2 -2
@@ -14897,7 +14897,7 @@ msgstr "extraer de todos los remotos" #: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" -msgstr "configurar upstream para git pulll/fetch" +msgstr "configurar upstream para git pull/fetch" #: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting"
@@ -19567,7 +19567,7 @@ msgstr "recibir programa de paquete" #: builtin/push.c:573 msgid "set upstream for git pull/status" -msgstr "configurar upstream para git pulll/status" +msgstr "configurar upstream para git pull/status" #: builtin/push.c:576 msgid "prune locally removed refs"
po/fr.po +1 -1
@@ -25124,7 +25124,7 @@ msgid "" " * Saying \"./%s\" if you mean a file; or\n" " * Giving --format-patch option if you mean a range.\n" msgstr "" -"Le fichier '%s' existe mais ce pourrait aussi être la plage de commmits\n" +"Le fichier '%s' existe mais ce pourrait aussi être la plage de commits\n" "pour lequel les patches sont à produire. Veuillez préciser...\n" "\n" " * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
po/sv.po +1 -1
@@ -17352,7 +17352,7 @@ msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet" #: builtin/mailinfo.c:64 msgid "re-code metadata to i18n.commitEncoding" -msgstr "koda om metadata till i18n.commmitEncoding" +msgstr "koda om metadata till i18n.commitEncoding" #: builtin/mailinfo.c:67 msgid "disable charset re-coding of metadata"
po/zh_CN.po +3 -3
@@ -4162,7 +4162,7 @@ msgstr "服务器支持 %s" #: fetch-pack.c:1029 msgid "Server does not support shallow clients" -msgstr "服务器不支持 shalllow 客户端" +msgstr "服务器不支持浅客户端" #: fetch-pack.c:1089 msgid "Server does not support --shallow-since"
@@ -4204,7 +4204,7 @@ msgstr "服务器不支持算法 '%s'" #: fetch-pack.c:1279 msgid "Server does not support shallow requests" -msgstr "服务器不支持 shalllow 请求" +msgstr "服务器不支持浅克隆请求" #: fetch-pack.c:1286 msgid "Server supports filter"
@@ -23864,7 +23864,7 @@ msgstr "预期仍然需要 %d 个字节的正文" #: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" -msgstr "哑 http 传输不支持 shalllow 能力" +msgstr "哑 http 传输不支持浅克隆能力" #: remote-curl.c:1147 msgid "fetch failed."
po/zh_TW.po +3 -3
@@ -4291,7 +4291,7 @@ msgstr "伺服器支援 %s" #: fetch-pack.c:1029 msgid "Server does not support shallow clients" -msgstr "伺服器不支援 shalllow 用戶端" +msgstr "伺服器不支援 shallow 用戶端" #: fetch-pack.c:1089 msgid "Server does not support --shallow-since"
@@ -4333,7 +4333,7 @@ msgstr "伺服器不支援「%s」算法" #: fetch-pack.c:1279 msgid "Server does not support shallow requests" -msgstr "伺服器不支援 shalllow 請求" +msgstr "伺服器不支援 shallow 請求" #: fetch-pack.c:1286 msgid "Server supports filter"
@@ -23992,7 +23992,7 @@ msgstr "預期仍要有 %d 位元組的本文 (body)" #: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" -msgstr "啞 http 傳輸不支援 shalllow 能力" +msgstr "啞 http 傳輸不支援 shallow 能力" #: remote-curl.c:1147 msgid "fetch failed."
Signature · 1 line
2.32.0.rc0.27.g7b1e85181b
Jiang Xin:
Quoted 2 lines
Andrei found that the word "shallow" has an extra letter "l" in "po/zh_CN.po". There are similar typos in other l10n files.
Andrei also pointed out another typo in the Swedish translation, where a configuration option had been copied incorrectly. Could you please amend your patch to contain both these changes?
From: Peter Krefting <[email protected]>
Date: Mon, 21 Jun 2021 20:31:28 +0100
Subject: [PATCH] l10n: sv.po: Update Swedish translation
Fix mistakes reported by Andrei Rybak <[email protected]>
--- po/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
po/sv.po +3 -3
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: git 2.32.0\n" "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n" "POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-20 13:31+0100\n" +"PO-Revision-Date: 2021-06-21 20:31+0100\n" "Last-Translator: Peter Krefting <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" "Language: sv\n"
@@ -2734,7 +2734,7 @@ msgstr "Felaktigt %s: \"%s\"" #: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" +msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" #: config.c:2558 #, c-format
@@ -17352,7 +17352,7 @@ msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet" #: builtin/mailinfo.c:64 msgid "re-code metadata to i18n.commitEncoding" -msgstr "koda om metadata till i18n.commmitEncoding" +msgstr "koda om metadata till i18n.commitEncoding" #: builtin/mailinfo.c:67 msgid "disable charset re-coding of metadata"
Signature · 1 line
2.29.2
Quoted 9 lines · Peter Krefting <[email protected]> 于2021年6月22日周二 上午3:36写道:
Jiang Xin:
Quoted 2 lines
Andrei found that the word "shallow" has an extra letter "l" in "po/zh_CN.po". There are similar typos in other l10n files.
Andrei also pointed out another typo in the Swedish translation, where a configuration option had been copied incorrectly. Could you please amend your patch to contain both these changes?
Will merge.
Quoted 4 lines · Jiang Xin
Quoted 3 lines · Peter Krefting <[email protected]> 于2021年6月22日周二 上午3:36写道:
Jiang Xin:
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Andrei found that the word "shallow" has an extra letter "l" in "po/zh_CN.po". There are similar typos in other l10n files.
Andrei also pointed out another typo in the Swedish translation, where a configuration option had been copied incorrectly. Could you please amend your patch to contain both these changes?
Will merge.
Thanks. I'll leave these changes to you and trust that you'll throw me a pull request for po/ later.
[L10N] fixed mismatched variable names
In reply to Peter KreftingFrom: Peter Krefting <[email protected]>
Quoted 7 lines · Peter Krefting
Andrei also pointed out another typo in the Swedish translation, where a configuration option had been copied incorrectly. Could you please amend your patch to contain both these changes?
... ...
Review msgstr "Felaktigt %s: \"%s\"" · line 2740
Quoted 8 lines
(quoted diff) +1
-1@@ -2734,7 +2734,7 @@ msgstr "Felaktigt %s: \"%s\"" #: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" +msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" #: config.c:2558 #, c-format
There are definitely more typos like this! In order to find mismatched git config variables and other mismatched variable names in the po file, I implemented a checker for such typos in the "git-po-helper" in commit:
* https://github.com/git-l10n/git-po-helper/commit/e44df847abb91227771560aca56719031f280068
To find typos, run:
git-po-helper check-po XX.po
All easy-to-fix typos can be fixed using the following patch, but there are still some typos need to be fixed by l10n team leaders for the following languages:
+ bg.po
+ id.po
+ tr.po
Patch for easy-to-fix typos, cut here -- 8< --
Subject: [PATCH] l10n: fixed mismatched config variables
Andrei pointed out a typo in the Swedish translation, where a config variable name had been copied incorrectly.
By introducing typo detection function in "git-po-helper", more typos were found. All easy-to-fix typos were fixed in this commit.
--- po/ca.po | 6 +++--- po/de.po | 2 +- po/es.po | 6 +++--- po/fr.po | 12 ++++++------ po/it.po | 4 ++-- po/ko.po | 6 +++--- po/pt_PT.po | 2 +- po/sv.po | 4 ++-- po/tr.po | 4 ++-- po/vi.po | 6 +++--- po/zh_CN.po | 12 ++++++------ po/zh_TW.po | 8 ++++---- 12 files changed, 36 insertions(+), 36 deletions(-)
po/ca.po +3 -3
@@ -5023,13 +5023,13 @@ msgstr "(comissió errònia)\n" #: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió." +msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió." #: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -"addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió." +"add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió." #: merge-recursive.c:876 #, c-format
@@ -15141,7 +15141,7 @@ msgstr "git fetch --all [<opcions>]" #: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" -msgstr "fetch.paral·lelisme no pot ser negatiu" +msgstr "fetch.parallel no pot ser negatiu" #: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes"
po/de.po +1 -1
@@ -3395,7 +3395,7 @@ msgstr "" #: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" +msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'" #: diff.c:470 #, c-format
po/es.po +3 -3
@@ -15267,7 +15267,7 @@ msgid "" "partialclone" msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." -"partialClone" +"partialclone" #: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote"
@@ -15684,7 +15684,7 @@ msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande" #: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" -msgstr "falló al analizar valor %s de gc.logexpirity" +msgstr "falló al analizar valor %s de gc.logexpiry" #: builtin/gc.c:587 #, c-format
@@ -16890,7 +16890,7 @@ msgstr "%s: modo cover from description inválido" #: builtin/log.c:850 msgid "format.headers without value" -msgstr "formate.headers. sin valor" +msgstr "format.headers sin valor" #: builtin/log.c:979 #, c-format
po/fr.po +6 -6
@@ -4719,12 +4719,12 @@ msgstr "(mauvais commit)\n" #: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." +msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion." #: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." +msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion." #: merge-recursive.c:876 #, c-format
@@ -5994,12 +5994,12 @@ msgid "Refresh index" msgstr "Rafraîchir l'index" #: read-cache.c:1700 -#, c-format +#, c-format, fuzzy msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -"version d'index renseignée, mais la valeur est invalide.\n" +"index.version renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" #: read-cache.c:1710
@@ -8275,7 +8275,7 @@ msgstr "nom de sous-module suspicieux %s ignoré" #: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" -msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" +msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchjobs" #: submodule-config.c:402 #, c-format
@@ -14645,7 +14645,7 @@ msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon." #: builtin/fetch.c:2079 msgid "--filter can only be used with the remote configured in extensions.partialclone" -msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans extensions.partialClone" +msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans extensions.partialclone" #: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote"
po/it.po +2 -2
@@ -14953,7 +14953,7 @@ msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -"--filter può essere usato solo con il remoto configurato nelle estensioni." +"--filter può essere usato solo con il remoto configurato nelle extensions." "partialclone" #: builtin/fetch.c:1891
@@ -21746,7 +21746,7 @@ msgid "could not generate diff %s^!." msgstr "impossibile generare il diff %s^!" #: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +msgid "conflicts in index. Try without --index." msgstr "ci sono conflitti nell'indice. Prova senza --index." #: builtin/stash.c:428
po/ko.po +3 -3
@@ -1702,7 +1702,7 @@ msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -"'diff.submodule' 설정 변수에 오류:\n" +"'diff.dirstat' 설정 변수에 오류:\n" "%s'" #: diff.c:3823
@@ -2261,12 +2261,12 @@ msgstr "(잘못된 커밋)\n" #: merge-recursive.c:320 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "'%s' 경로에 대해 addinfo_cache 실패. 병합 중지." +msgstr "'%s' 경로에 대해 add_cacheinfo 실패. 병합 중지." #: merge-recursive.c:328 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "'%s' 경로에 대해 addinfo_cache 새로 고침 실패. 병합 중지." +msgstr "'%s' 경로에 대해 add_cacheinfo 새로 고침 실패. 병합 중지." #: merge-recursive.c:410 msgid "error building trees"
po/pt_PT.po +1 -1
@@ -14610,7 +14610,7 @@ msgstr "Referência remota HEAD não encontrada" #: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" -msgstr "a configuração fetch.ouput contém o valor inválido %s" +msgstr "a configuração fetch.output contém o valor inválido %s" #: builtin/fetch.c:775 #, c-format
po/sv.po +2 -2
@@ -2734,7 +2734,7 @@ msgstr "Felaktigt %s: \"%s\"" #: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" +msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" #: config.c:2558 #, c-format
@@ -4910,7 +4910,7 @@ msgstr "(felaktig incheckning)\n" #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." +"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." #: merge-recursive.c:388 #, c-format
po/tr.po +2 -2
@@ -12344,7 +12344,7 @@ msgstr "" "\tgit checkout --track origin/<ad>\n" "\n" "Eğer her zaman belirsiz <ad> çıkışlarının bir uzak konumu tercih etmesini\n" -"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultsRemote=origin\n" +"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n" "ayarını yapmayı düşünün." #: builtin/checkout.c:1201
@@ -24179,7 +24179,7 @@ msgstr "uzak sunucu durumsuz ayırıcı gönderdi" #: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -"rpc sonrası verisi geri sarılamıyor - https.postBuffer'ı artırmayı deneyin" +"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin" #: remote-curl.c:754 #, c-format
po/vi.po +3 -3
@@ -4907,13 +4907,13 @@ msgstr "(commit sai)\n" #: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ." +msgstr "add_cacheinfo gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ." #: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." 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ị " +"add_cacheinfo 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ỏ." #: merge-recursive.c:876
@@ -8585,7 +8585,7 @@ msgstr "đang lờ đi tên mô-đun-con mập mờ: %s" #: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" -msgstr "không cho phép giá trị âm ở submodule.fetchJobs" +msgstr "không cho phép giá trị âm ở submodule.fetchjobs" #: submodule-config.c:402 #, c-format
po/zh_CN.po +6 -6
@@ -142,7 +142,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n" "POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-06-05 22:10+0800\n" +"PO-Revision-Date: 2021-07-01 16:01+0800\n" "Last-Translator: Jiang Xin <[email protected]>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n"
@@ -3060,7 +3060,7 @@ msgstr "关闭 rev-list 的标准输入失败" #: convert.c:183 #, c-format msgid "illegal crlf_action %d" -msgstr "非法的 crlf 动作 %d" +msgstr "非法的 crlf_action %d" #: convert.c:196 #, c-format
@@ -5373,7 +5373,7 @@ msgstr "不能创建 lazy_name 线程:%s" #: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lasy_name 线程:%s" +msgstr "不能加入 lazy_name 线程:%s" #: notes-merge.c:277 #, c-format
@@ -15034,7 +15034,7 @@ msgstr "协议不支持 --negotiate-only,退出。" msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" -msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" +msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" #: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote"
@@ -17726,7 +17726,7 @@ msgstr "错误:标签输入未通过 fsck:%s" #: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" -msgstr "%d(忽略 FSCK?)不应该触发这个调用" +msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调" #: builtin/mktag.c:56 #, c-format
@@ -22356,7 +22356,7 @@ msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" #: builtin/submodule--helper.c:1799 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" +msgstr "不能识别 submodule.alternateLocation 的取值 '%s'" #: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to"
po/zh_TW.po +4 -4
@@ -3199,7 +3199,7 @@ msgstr "關閉 rev-list 的標準輸入失敗" #: convert.c:183 #, c-format msgid "illegal crlf_action %d" -msgstr "非法的 crlf 動作 %d" +msgstr "非法的 crlf_action %d" #: convert.c:196 #, c-format
@@ -5502,7 +5502,7 @@ msgstr "不能建立 lazy_name 執行緒:%s" #: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lasy_name 執行緒:%s" +msgstr "不能加入 lazy_name 執行緒:%s" #: notes-merge.c:277 #, c-format
@@ -15156,7 +15156,7 @@ msgstr "協定不支援 --negotiate-only,結束。" msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" -msgstr "只可以將 --filter 用於在 extensions.partialClone 中設定的遠端版本庫" +msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" #: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote"
@@ -22482,7 +22482,7 @@ msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" #: builtin/submodule--helper.c:1799 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'" +msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" #: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to"
Signature · 1 line
2.32.0.rc0.27.g7b1e85181b
Re: [L10N] fixed mismatched variable names
Quoted 40 lines · Jiang Xin
From: Peter Krefting <[email protected]>
Quoted 7 lines · Peter Krefting
Andrei also pointed out another typo in the Swedish translation, where a configuration option had been copied incorrectly. Could you please amend your patch to contain both these changes?
... ...
po/sv.po msgstr "Felaktigt %s: \"%s\"" · line 2740
Quoted 8 lines
po/sv.po +1
-1@@ -2734,7 +2734,7 @@ msgstr "Felaktigt %s: \"%s\"" #: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" +msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" #: config.c:2558 #, c-formatThere are definitely more typos like this! In order to find mismatched git config variables and other mismatched variable names in the po file, I implemented a checker for such typos in the "git-po-helper" in commit:
* https://github.com/git-l10n/git-po-helper/commit/e44df847abb91227771560aca56719031f280068
To find typos, run:
git-po-helper check-po XX.po
All easy-to-fix typos can be fixed using the following patch, but there are still some typos need to be fixed by l10n team leaders for the following languages:
+ bg.po
+ id.po
+ tr.poPatch for easy-to-fix typos, cut here -- 8< --
Quoted 7 lines
Subject: [PATCH] l10n: fixed mismatched config variables
Andrei pointed out a typo in the Swedish translation, where a config variable name had been copied incorrectly.
By introducing typo detection function in "git-po-helper", more typos were found. All easy-to-fix typos were fixed in this commit.
This seems like a good narrow fix for now, but I'd think a much better fix would be to e.g. add something to the CI or a lintk check based on "git help --config" that errored if any string meant for gettext contains such a variable.
It's data that isn't meant to be translated at all, so we should be passing it as %s to the format string.
I see there's at least one fix that fixes a reference to a function internal to git.git, such a check wouldn't catch that, but that message should be fixed too. We shouldn't have anything referencing code names except the BUG() messages (which we don't translate)>
Re: [L10N] fixed mismatched variable names
Quoted 6 lines · Ævar Arnfjörð Bjarmason <[email protected]> 于2021年7月3日周六 下午7:47写道:
This seems like a good narrow fix for now, but I'd think a much better fix would be to e.g. add something to the CI or a lintk check based on "git help --config" that errored if any string meant for gettext contains such a variable.
Quoted 7 lines
It's data that isn't meant to be translated at all, so we should be passing it as %s to the format string.
I see there's at least one fix that fixes a reference to a function internal to git.git, such a check wouldn't catch that, but that message should be fixed too. We shouldn't have anything referencing code names except the
BUG()messages (which we don't translate)>
There are at least three types of constant strings that should not be
translated: git config variables, function or variable names, git commands or command options. See new test cases in commit:
https://github.com/git-l10n/git-po-helper/commit/86791cf25b17b6853bcbad7b501a76906ac86a02
Re: [L10N] fixed mismatched variable names
In reply to Jiang XinQuoted 31 lines · Jiang Xin <[email protected]> 于2021年7月3日周六 下午7:19写道:
From: Peter Krefting <[email protected]>
Quoted 7 lines · Peter Krefting
Andrei also pointed out another typo in the Swedish translation, where a configuration option had been copied incorrectly. Could you please amend your patch to contain both these changes?
... ...
po/sv.po msgstr "Felaktigt %s: \"%s\"" · line 2740
Quoted 8 lines
po/sv.po +1
-1@@ -2734,7 +2734,7 @@ msgstr "Felaktigt %s: \"%s\"" #: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" +msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" #: config.c:2558 #, c-formatThere are definitely more typos like this! In order to find mismatched git config variables and other mismatched variable names in the po file, I implemented a checker for such typos in the "git-po-helper" in commit:
* https://github.com/git-l10n/git-po-helper/commit/e44df847abb91227771560aca56719031f280068
To find typos, run:
git-po-helper check-po XX.po
Quoted 8 lines
All easy-to-fix typos can be fixed using the following patch, but there are still some typos need to be fixed by l10n team leaders for the following languages:
+ bg.po
+ id.po
+ tr.po
More typos will be fixed in pull request:
https://github.com/git-l10n/git-po/pull/534
PATCH 1/1 po/id.po: fix mismatched variable names
In reply to Jiang XinJiang Xin notified me [1] to fix some typos. Running git-po-helper [2] check, it found following:
1. git submodule--helper typo (was git submodule==helper)
2. new_index improper translation (DO NOT translate instead)
Fix them.
This patch is also available as PR at [3]. It can also be squashed into [1].
[1]:
https://lore.kernel.org/git/[email protected]/
[2]:
https://github.com/git-l10n/git-po-helper/commit/e44df847abb91227771560aca56719031f280068
[3]: https://github.com/git-l10n/git-po/pull/535
--- po/id.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
po/id.po +3 -3
@@ -12822,7 +12822,7 @@ msgstr "gagal memperbarui tembolok pohon utama" #: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" -msgstr "tidak dapat menulis berkas indeks baru" +msgstr "tidak dapat menulis berkas new_index" #: builtin/commit.c:489 msgid "cannot do a partial commit during a merge."
@@ -13330,7 +13330,7 @@ msgid "" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "repositori sudah diperbarui, tetapi tidak dapat menulis\n" -"berkas indeks baru. Periksa bahwa disk tidak penuh dan kuota\n" +"berkas new_index. Periksa bahwa disk tidak penuh dan kuota\n" "tidak terlampaui, lalu \"git restore --staged :/\" untuk pulihkan." #: builtin/config.c:11
@@ -21717,7 +21717,7 @@ msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]" #: builtin/submodule--helper.c:918 msgid "git submodule--helper name <path>" -msgstr "git submodule==helper name <jalur>" +msgstr "git submodule--helper name <jalur>" #: builtin/submodule--helper.c:990 #, c-format
base-commit: 9146ef75dd34f27ab3c70b041af9506357c940df
Signature · 1 line
2.25.1