Skip to content

Commit ae4e099

Browse files
nafmojiangxin
authored andcommitted
l10n: fixed typos of mismatched constant strings
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. Reported-by: Andrei Rybak <[email protected]> Signed-off-by: Peter Krefting <[email protected]> Signed-off-by: Jiang Xin <[email protected]>
1 parent 5dbeffd commit ae4e099

File tree

11 files changed

+49
-49
lines changed

11 files changed

+49
-49
lines changed

po/de.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3395,7 +3395,7 @@ msgstr ""
33953395
#: diff.c:410
33963396
#, c-format
33973397
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3398-
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
3398+
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
33993399

34003400
#: diff.c:470
34013401
#, c-format

po/es.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6368,7 +6368,7 @@ msgstr "no es posible crear hilo load_cache_entries: %s"
63686368
#: read-cache.c:2193
63696369
#, c-format
63706370
msgid "unable to join load_cache_entries thread: %s"
6371-
msgstr "no es posible unir hilo load_cache_entires: %s"
6371+
msgstr "no es posible unir hilo load_cache_entries: %s"
63726372

63736373
#: read-cache.c:2226
63746374
#, c-format
@@ -7957,7 +7957,7 @@ msgstr "revert ya está en progreso"
79577957
#: sequencer.c:3031
79587958
#, c-format
79597959
msgid "try \"git revert (--continue | %s--abort | --quit)\""
7960-
msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
7960+
msgstr "intenta \"git revert (--continue | %s--abort | --quit)\""
79617961

79627962
#: sequencer.c:3034
79637963
msgid "cherry-pick is already in progress"
@@ -7966,7 +7966,7 @@ msgstr "cherry-pick ya está en progreso"
79667966
#: sequencer.c:3036
79677967
#, c-format
79687968
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
7969-
msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
7969+
msgstr "intenta \"git cherry-pick (--continue | %s--abort | --quit)\""
79707970

79717971
#: sequencer.c:3050
79727972
#, c-format
@@ -15267,7 +15267,7 @@ msgid ""
1526715267
"partialclone"
1526815268
msgstr ""
1526915269
"--filter solo puede ser usado con el remoto configurado en extensions."
15270-
"partialClone"
15270+
"partialclone"
1527115271

1527215272
#: builtin/fetch.c:2083
1527315273
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"
1568415684
#: builtin/gc.c:576
1568515685
#, c-format
1568615686
msgid "failed to parse gc.logexpiry value %s"
15687-
msgstr "falló al analizar valor %s de gc.logexpirity"
15687+
msgstr "falló al analizar valor %s de gc.logexpiry"
1568815688

1568915689
#: builtin/gc.c:587
1569015690
#, c-format
@@ -16890,7 +16890,7 @@ msgstr "%s: modo cover from description inválido"
1689016890

1689116891
#: builtin/log.c:850
1689216892
msgid "format.headers without value"
16893-
msgstr "formate.headers. sin valor"
16893+
msgstr "format.headers sin valor"
1689416894

1689516895
#: builtin/log.c:979
1689616896
#, c-format
@@ -22474,7 +22474,7 @@ msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
2247422474

2247522475
#: builtin/submodule--helper.c:64
2247622476
msgid "submodule--helper print-default-remote takes no arguments"
22477-
msgstr "subomdule--helper print-default-remote no toma argumentos"
22477+
msgstr "submodule--helper print-default-remote no toma argumentos"
2247822478

2247922479
#: builtin/submodule--helper.c:102
2248022480
#, c-format

po/fr.po

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4719,12 +4719,12 @@ msgstr "(mauvais commit)\n"
47194719
#: merge-recursive.c:379
47204720
#, c-format
47214721
msgid "add_cacheinfo failed for path '%s'; merge aborting."
4722-
msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."
4722+
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
47234723

47244724
#: merge-recursive.c:388
47254725
#, c-format
47264726
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4727-
msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."
4727+
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
47284728

47294729
#: merge-recursive.c:876
47304730
#, c-format
@@ -5994,12 +5994,12 @@ msgid "Refresh index"
59945994
msgstr "Rafraîchir l'index"
59955995

59965996
#: read-cache.c:1700
5997-
#, c-format
5997+
#, c-format, fuzzy
59985998
msgid ""
59995999
"index.version set, but the value is invalid.\n"
60006000
"Using version %i"
60016001
msgstr ""
6002-
"version d'index renseignée, mais la valeur est invalide.\n"
6002+
"index.version renseignée, mais la valeur est invalide.\n"
60036003
"Utilisation de la version %i"
60046004

60056005
#: read-cache.c:1710
@@ -6073,7 +6073,7 @@ msgstr "impossible de créer le fil load_cache_entries : %s"
60736073
#: read-cache.c:2193
60746074
#, c-format
60756075
msgid "unable to join load_cache_entries thread: %s"
6076-
msgstr "impossible de joindre le fil load_cach_entries : %s"
6076+
msgstr "impossible de joindre le fil load_cache_entries : %s"
60776077

60786078
#: read-cache.c:2226
60796079
#, c-format
@@ -8275,7 +8275,7 @@ msgstr "nom de sous-module suspicieux %s ignoré"
82758275

82768276
#: submodule-config.c:304
82778277
msgid "negative values not allowed for submodule.fetchjobs"
8278-
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
8278+
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchjobs"
82798279

82808280
#: submodule-config.c:402
82818281
#, c-format
@@ -10717,7 +10717,7 @@ msgstr "doit finir avec une couleur"
1071710717
#: builtin/blame.c:728
1071810718
#, c-format
1071910719
msgid "invalid color '%s' in color.blame.repeatedLines"
10720-
msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
10720+
msgstr "couleur invalide '%s' dans color.blame.repeatedLines"
1072110721

1072210722
#: builtin/blame.c:746
1072310723
msgid "invalid value for blame.coloring"
@@ -13779,7 +13779,7 @@ msgstr "afficher les messages de debug sur stderr"
1377913779

1378013780
#: builtin/credential-cache--daemon.c:316
1378113781
msgid "credential-cache--daemon unavailable; no unix socket support"
13782-
msgstr "credential-cache-daemon non disponible ; pas de gestion des sockets unix"
13782+
msgstr "credential-cache--daemon non disponible ; pas de gestion des sockets unix"
1378313783

1378413784
#: builtin/credential-cache.c:154
1378513785
msgid "credential-cache unavailable; no unix socket support"
@@ -14645,7 +14645,7 @@ msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon."
1464514645

1464614646
#: builtin/fetch.c:2079
1464714647
msgid "--filter can only be used with the remote configured in extensions.partialclone"
14648-
msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans extensions.partialClone"
14648+
msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans extensions.partialclone"
1464914649

1465014650
#: builtin/fetch.c:2083
1465114651
msgid "--atomic can only be used when fetching from one remote"
@@ -23221,7 +23221,7 @@ msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
2322123221

2322223222
#: http.c:910
2322323223
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
23224-
msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0"
23224+
msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0"
2322523225

2322623226
#: http.c:989
2322723227
msgid "Protocol restrictions not supported with cURL < 7.19.4"

po/it.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14953,7 +14953,7 @@ msgid ""
1495314953
"--filter can only be used with the remote configured in extensions."
1495414954
"partialclone"
1495514955
msgstr ""
14956-
"--filter può essere usato solo con il remoto configurato nelle estensioni."
14956+
"--filter può essere usato solo con il remoto configurato nelle extensions."
1495714957
"partialclone"
1495814958

1495914959
#: builtin/fetch.c:1891
@@ -19253,7 +19253,7 @@ msgstr ""
1925319253

1925419254
#: builtin/rebase.c:474
1925519255
msgid "git rebase--interactive [<options>]"
19256-
msgstr "git rebase --interactive [<opzioni>]"
19256+
msgstr "git rebase--interactive [<opzioni>]"
1925719257

1925819258
#: builtin/rebase.c:487 builtin/rebase.c:1382
1925919259
msgid "keep commits which start empty"
@@ -21746,7 +21746,7 @@ msgid "could not generate diff %s^!."
2174621746
msgstr "impossibile generare il diff %s^!"
2174721747

2174821748
#: builtin/stash.c:422
21749-
msgid "conflicts in index.Try without --index."
21749+
msgid "conflicts in index. Try without --index."
2175021750
msgstr "ci sono conflitti nell'indice. Prova senza --index."
2175121751

2175221752
#: builtin/stash.c:428

po/ko.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ msgid ""
17021702
"Found errors in 'diff.dirstat' config variable:\n"
17031703
"%s"
17041704
msgstr ""
1705-
"'diff.submodule' 설정 변수에 오류:\n"
1705+
"'diff.dirstat' 설정 변수에 오류:\n"
17061706
"%s'"
17071707

17081708
#: diff.c:3823
@@ -2261,12 +2261,12 @@ msgstr "(잘못된 커밋)\n"
22612261
#: merge-recursive.c:320
22622262
#, c-format
22632263
msgid "add_cacheinfo failed for path '%s'; merge aborting."
2264-
msgstr "'%s' 경로에 대해 addinfo_cache 실패. 병합 중지."
2264+
msgstr "'%s' 경로에 대해 add_cacheinfo 실패. 병합 중지."
22652265

22662266
#: merge-recursive.c:328
22672267
#, c-format
22682268
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
2269-
msgstr "'%s' 경로에 대해 addinfo_cache 새로 고침 실패. 병합 중지."
2269+
msgstr "'%s' 경로에 대해 add_cacheinfo 새로 고침 실패. 병합 중지."
22702270

22712271
#: merge-recursive.c:410
22722272
msgid "error building trees"
@@ -10983,7 +10983,7 @@ msgid ""
1098310983
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1098410984
"Please, commit your changes before you merge."
1098510985
msgstr ""
10986-
"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있음)\n"
10986+
"커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있음)\n"
1098710987
"병합하기 전에 변경 사항을 커밋하십시오."
1098810988

1098910989
#: builtin/merge.c:1257

po/pt_PT.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14610,7 +14610,7 @@ msgstr "Referência remota HEAD não encontrada"
1461014610
#: builtin/fetch.c:677
1461114611
#, c-format
1461214612
msgid "configuration fetch.output contains invalid value %s"
14613-
msgstr "a configuração fetch.ouput contém o valor inválido %s"
14613+
msgstr "a configuração fetch.output contém o valor inválido %s"
1461414614

1461514615
#: builtin/fetch.c:775
1461614616
#, c-format

po/sv.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2734,7 +2734,7 @@ msgstr "Felaktigt %s: \"%s\""
27342734
#: config.c:2512
27352735
#, c-format
27362736
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2737-
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
2737+
msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
27382738

27392739
#: config.c:2558
27402740
#, c-format
@@ -4910,7 +4910,7 @@ msgstr "(felaktig incheckning)\n"
49104910
#, c-format
49114911
msgid "add_cacheinfo failed for path '%s'; merge aborting."
49124912
msgstr ""
4913-
"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
4913+
"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
49144914

49154915
#: merge-recursive.c:388
49164916
#, c-format
@@ -6314,12 +6314,12 @@ msgid "index file corrupt"
63146314
msgstr "indexfilen trasig"
63156315

63166316
#: read-cache.c:2180
6317-
#, c-format
6317+
#, c-format, fuzzy
63186318
msgid "unable to create load_cache_entries thread: %s"
63196319
msgstr "kunde inte läsa in cache_entries-tråden: %s"
63206320

63216321
#: read-cache.c:2193
6322-
#, c-format
6322+
#, c-format, fuzzy
63236323
msgid "unable to join load_cache_entries thread: %s"
63246324
msgstr "kunde inte utföra join på cache_entries-tråden: %s"
63256325

@@ -10777,7 +10777,7 @@ msgid ""
1077710777
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
1077810778
"term-new]"
1077910779
msgstr ""
10780-
"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10780+
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
1078110781
"term-new]"
1078210782

1078310783
#: builtin/bisect--helper.c:26

po/tr.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12344,7 +12344,7 @@ msgstr ""
1234412344
"\tgit checkout --track origin/<ad>\n"
1234512345
"\n"
1234612346
"Eğer her zaman belirsiz <ad> çıkışlarının bir uzak konumu tercih etmesini\n"
12347-
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultsRemote=origin\n"
12347+
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
1234812348
"ayarını yapmayı düşünün."
1234912349

1235012350
#: builtin/checkout.c:1201
@@ -14349,7 +14349,7 @@ msgstr "hata ayıklama iletilerini stderr'e yazdır"
1434914349

1435014350
#: builtin/credential-cache--daemon.c:316
1435114351
msgid "credential-cache--daemon unavailable; no unix socket support"
14352-
msgstr "credential-cache-daemon kullanılamıyor; unix soket desteği yok"
14352+
msgstr "credential-cache--daemon kullanılamıyor; unix soket desteği yok"
1435314353

1435414354
#: builtin/credential-cache.c:154
1435514355
msgid "credential-cache unavailable; no unix socket support"
@@ -14700,7 +14700,7 @@ msgstr "git_env_*(...)'ın geri çekileceği öntanımlı"
1470014700

1470114701
#: builtin/env--helper.c:48
1470214702
msgid "be quiet only use git_env_*() value as exit code"
14703-
msgstr "sessiz ol, yalnızca git_env*() değerini çıkış kodu olarak kullan"
14703+
msgstr "sessiz ol, yalnızca git_env_*() değerini çıkış kodu olarak kullan"
1470414704

1470514705
#: builtin/env--helper.c:67
1470614706
#, c-format
@@ -22911,7 +22911,7 @@ msgstr "%s, --super-prefix desteklemiyor"
2291122911
#: builtin/submodule--helper.c:2799
2291222912
#, c-format
2291322913
msgid "'%s' is not a valid submodule--helper subcommand"
22914-
msgstr "'%s' geçerli bir submodule-helper altkomutu değil"
22914+
msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
2291522915

2291622916
#: builtin/symbolic-ref.c:8
2291722917
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -24179,7 +24179,7 @@ msgstr "uzak sunucu durumsuz ayırıcı gönderdi"
2417924179
#: remote-curl.c:724
2418024180
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
2418124181
msgstr ""
24182-
"rpc sonrası verisi geri sarılamıyor - https.postBuffer'ı artırmayı deneyin"
24182+
"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
2418324183

2418424184
#: remote-curl.c:754
2418524185
#, c-format

po/vi.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4907,13 +4907,13 @@ msgstr "(commit sai)\n"
49074907
#: merge-recursive.c:379
49084908
#, c-format
49094909
msgid "add_cacheinfo failed for path '%s'; merge aborting."
4910-
msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
4910+
msgstr "add_cacheinfo gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
49114911

49124912
#: merge-recursive.c:388
49134913
#, c-format
49144914
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
49154915
msgstr ""
4916-
"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ị "
4916+
"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ị "
49174917
"bãi bỏ."
49184918

49194919
#: merge-recursive.c:876
@@ -8585,7 +8585,7 @@ msgstr "đang lờ đi tên mô-đun-con mập mờ: %s"
85858585

85868586
#: submodule-config.c:304
85878587
msgid "negative values not allowed for submodule.fetchjobs"
8588-
msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
8588+
msgstr "không cho phép giá trị âm ở submodule.fetchjobs"
85898589

85908590
#: submodule-config.c:402
85918591
#, c-format

po/zh_CN.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ msgstr ""
142142
"Project-Id-Version: Git\n"
143143
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
144144
"POT-Creation-Date: 2021-05-17 16:02+0800\n"
145-
"PO-Revision-Date: 2021-06-05 22:10+0800\n"
145+
"PO-Revision-Date: 2021-07-01 16:01+0800\n"
146146
"Last-Translator: Jiang Xin <[email protected]>\n"
147147
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
148148
"Language: zh_CN\n"
@@ -3060,7 +3060,7 @@ msgstr "关闭 rev-list 的标准输入失败"
30603060
#: convert.c:183
30613061
#, c-format
30623062
msgid "illegal crlf_action %d"
3063-
msgstr "非法的 crlf 动作 %d"
3063+
msgstr "非法的 crlf_action %d"
30643064

30653065
#: convert.c:196
30663066
#, c-format
@@ -5373,7 +5373,7 @@ msgstr "不能创建 lazy_name 线程:%s"
53735373
#: name-hash.c:570
53745374
#, c-format
53755375
msgid "unable to join lazy_name thread: %s"
5376-
msgstr "不能加入 lasy_name 线程:%s"
5376+
msgstr "不能加入 lazy_name 线程:%s"
53775377

53785378
#: notes-merge.c:277
53795379
#, c-format
@@ -15034,7 +15034,7 @@ msgstr "协议不支持 --negotiate-only,退出。"
1503415034
msgid ""
1503515035
"--filter can only be used with the remote configured in extensions."
1503615036
"partialclone"
15037-
msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
15037+
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
1503815038

1503915039
#: builtin/fetch.c:2083
1504015040
msgid "--atomic can only be used when fetching from one remote"
@@ -17726,7 +17726,7 @@ msgstr "错误:标签输入未通过 fsck:%s"
1772617726
#: builtin/mktag.c:41
1772717727
#, c-format
1772817728
msgid "%d (FSCK_IGNORE?) should never trigger this callback"
17729-
msgstr "%d(忽略 FSCK?)不应该触发这个调用"
17729+
msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
1773017730

1773117731
#: builtin/mktag.c:56
1773217732
#, c-format
@@ -22356,7 +22356,7 @@ msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
2235622356
#: builtin/submodule--helper.c:1799
2235722357
#, c-format
2235822358
msgid "Value '%s' for submodule.alternateLocation is not recognized"
22359-
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
22359+
msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
2236022360

2236122361
#: builtin/submodule--helper.c:1823
2236222362
msgid "where the new submodule will be cloned to"

0 commit comments

Comments
 (0)