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