l10n: batch update to fix typo in branch.c
In git 2.35 l10n round 1, a space between two words was missing in the message from "branch.c", and it was fixed by commit 68d924e1de (branch: missing space fix at line 313, 2022-01-11). Do a batch update for teams (bg, fr, id, sv, tr and zh_CN) that have already completed their works on l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Jan 17, 2022 at 08:50 UTC
ee27abd30d4a72946006126a836bfabdf1ea73f2
6 files changed
+476
-451
po/bg.po
+70
-69
@@ -187,7 +187,7 @@ msgid ""
187
msgstr ""
188
"Project-Id-Version: git 2.34\n"
189
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
190
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
190
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
191
"PO-Revision-Date: 2022-01-16 10:50+0100\n"
192
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
193
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -1095,8 +1095,8 @@ msgstr "непозната опция за игнориране на знаци
1095
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
1096
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
1097
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
1098
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
1099
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
1098
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
1099
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
1100
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
1101
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
1102
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@@ -2184,7 +2184,7 @@ msgstr "вече съществува клон с име „%s“."
2184
# FIXME
2185
#: branch.c:313
2186
#, c-format
2187
-msgid "cannot force update the branch '%s'checked out at '%s'"
2187
+msgid "cannot force update the branch '%s' checked out at '%s'"
2188
msgstr ""
2189
"не може принудително да обновите клона „%s“, който е изтеглен в пътя „%s“"
2190
@@ -6121,7 +6121,7 @@ msgstr "„%s“ не може да се вмъкне в базата от да
6121
msgid "%s: unsupported file type"
6122
msgstr "неподдържан вид файл: „%s“"
6123
6124
-#: object-file.c:2329 builtin/fetch.c:1448
6124
+#: object-file.c:2329 builtin/fetch.c:1453
6125
#, c-format
6126
msgid "%s is not a valid object"
6127
msgstr "„%s“ е неправилен обект"
@@ -7420,41 +7420,41 @@ msgstr "указател не може да се обнови с грешно и
7420
msgid "update_ref failed for ref '%s': %s"
7421
msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
7422
7423
-#: refs.c:2069
7423
+#: refs.c:2067
7424
#, c-format
7425
msgid "multiple updates for ref '%s' not allowed"
7426
msgstr "не са позволени повече от една промени на указателя „%s“"
7427
7428
-#: refs.c:2152
7428
+#: refs.c:2150
7429
msgid "ref updates forbidden inside quarantine environment"
7430
msgstr "обновяванията на указатели са забранени в среди под карантина"
7431
7432
-#: refs.c:2163
7432
+#: refs.c:2161
7433
msgid "ref updates aborted by hook"
7434
msgstr "обновяванията на указатели са преустановени от кука"
7435
7436
-#: refs.c:2271 refs.c:2301
7436
+#: refs.c:2269 refs.c:2299
7437
#, c-format
7438
msgid "'%s' exists; cannot create '%s'"
7439
msgstr "„%s“ съществува, не може да се създаде „%s“"
7440
7441
-#: refs.c:2277 refs.c:2312
7441
+#: refs.c:2275 refs.c:2310
7442
#, c-format
7443
msgid "cannot process '%s' and '%s' at the same time"
7444
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
7445
7446
-#: refs/files-backend.c:1268
7446
+#: refs/files-backend.c:1267
7447
#, c-format
7448
msgid "could not remove reference %s"
7449
msgstr "Указателят „%s“ не може да бъде изтрит"
7450
7451
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
7451
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
7452
#: refs/packed-backend.c:1559
7453
#, c-format
7454
msgid "could not delete reference %s: %s"
7455
msgstr "Указателят „%s“ не може да бъде изтрит: %s"
7456
7457
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
7457
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
7458
#, c-format
7459
msgid "could not delete references: %s"
7460
msgstr "Указателите не може да бъдат изтрити: %s"
@@ -8533,7 +8533,8 @@ msgstr ""
8533
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
8534
"предстои да бъде създаден"
8535
8536
-#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
8536
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
8537
+#: builtin/grep.c:772
8538
#, c-format
8539
msgid "cannot open '%s'"
8540
msgstr "„%s“ не може да бъде отворен"
@@ -9509,7 +9510,7 @@ msgstr "протоколът не поддържа задаването на п
9510
msgid "invalid remote service path"
9511
msgstr "неправилен път на отдалечената услуга"
9512
9512
-#: transport-helper.c:661 transport.c:1474
9513
+#: transport-helper.c:661 transport.c:1479
9514
msgid "operation not supported by protocol"
9515
msgstr "опцията не се поддържа от протокола"
9516
@@ -13828,7 +13829,7 @@ msgstr "опциите „%s“ и „%s %s“ са несъвместими"
13829
msgid "repository '%s' does not exist"
13830
msgstr "не съществува хранилище „%s“"
13831
13831
-#: builtin/clone.c:924 builtin/fetch.c:2047
13832
+#: builtin/clone.c:924 builtin/fetch.c:2052
13833
#, c-format
13834
msgid "depth %s is not a positive number"
13835
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
@@ -15778,70 +15779,70 @@ msgstr "запазване на гра̀фа с подаванията след
15779
msgid "accept refspecs from stdin"
15780
msgstr "четене на указателите от стандартния вход"
15781
15781
-#: builtin/fetch.c:587
15782
+#: builtin/fetch.c:592
15783
msgid "couldn't find remote ref HEAD"
15784
msgstr "указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
15785
15785
-#: builtin/fetch.c:761
15786
+#: builtin/fetch.c:766
15787
#, c-format
15788
msgid "configuration fetch.output contains invalid value %s"
15789
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
15790
15790
-#: builtin/fetch.c:862
15791
+#: builtin/fetch.c:867
15792
#, c-format
15793
msgid "object %s not found"
15794
msgstr "обектът „%s“ липсва"
15795
15795
-#: builtin/fetch.c:866
15796
+#: builtin/fetch.c:871
15797
msgid "[up to date]"
15798
msgstr "[актуален]"
15799
15799
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
15800
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
15801
msgid "[rejected]"
15802
msgstr "[отхвърлен]"
15803
15803
-#: builtin/fetch.c:880
15804
+#: builtin/fetch.c:885
15805
msgid "can't fetch in current branch"
15806
msgstr "в текущия клон не може да се доставя"
15807
15807
-#: builtin/fetch.c:881
15808
+#: builtin/fetch.c:886
15809
msgid "checked out in another worktree"
15810
msgstr "изтеглен в друго работно дърво"
15811
15811
-#: builtin/fetch.c:891
15812
+#: builtin/fetch.c:896
15813
msgid "[tag update]"
15814
msgstr "[обновяване на етикетите]"
15815
15815
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
15816
-#: builtin/fetch.c:963
15816
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
15817
+#: builtin/fetch.c:968
15818
msgid "unable to update local ref"
15819
msgstr "локален указател не може да бъде обновен"
15820
15820
-#: builtin/fetch.c:896
15821
+#: builtin/fetch.c:901
15822
msgid "would clobber existing tag"
15823
msgstr "съществуващ етикет ще бъде презаписан"
15824
15824
-#: builtin/fetch.c:918
15825
+#: builtin/fetch.c:923
15826
msgid "[new tag]"
15827
msgstr "[нов етикет]"
15828
15828
-#: builtin/fetch.c:921
15829
+#: builtin/fetch.c:926
15830
msgid "[new branch]"
15831
msgstr "[нов клон]"
15832
15832
-#: builtin/fetch.c:924
15833
+#: builtin/fetch.c:929
15834
msgid "[new ref]"
15835
msgstr "[нов указател]"
15836
15836
-#: builtin/fetch.c:963
15837
+#: builtin/fetch.c:968
15838
msgid "forced update"
15839
msgstr "принудително обновяване"
15840
15840
-#: builtin/fetch.c:968
15841
+#: builtin/fetch.c:973
15842
msgid "non-fast-forward"
15843
msgstr "същинско сливане"
15844
15844
-#: builtin/fetch.c:1071
15845
+#: builtin/fetch.c:1076
15846
msgid ""
15847
"fetch normally indicates which branches had a forced update,\n"
15848
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@@ -15854,7 +15855,7 @@ msgstr ""
15855
"\n"
15856
" git config fetch.showForcedUpdates true"
15857
15857
-#: builtin/fetch.c:1075
15858
+#: builtin/fetch.c:1080
15859
#, c-format
15860
msgid ""
15861
"it took %.2f seconds to check forced updates; you can use\n"
@@ -15868,23 +15869,23 @@ msgstr ""
15869
"\n"
15870
" git config fetch.showForcedUpdates false\n"
15871
15871
-#: builtin/fetch.c:1107
15872
+#: builtin/fetch.c:1112
15873
#, c-format
15874
msgid "%s did not send all necessary objects\n"
15875
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
15876
15876
-#: builtin/fetch.c:1136
15877
+#: builtin/fetch.c:1141
15878
#, c-format
15879
msgid "rejected %s because shallow roots are not allowed to be updated"
15880
msgstr ""
15881
"отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
15882
15882
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
15883
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
15884
#, c-format
15885
msgid "From %.*s\n"
15886
msgstr "От %.*s\n"
15887
15887
-#: builtin/fetch.c:1247
15888
+#: builtin/fetch.c:1252
15889
#, c-format
15890
msgid ""
15891
"some local refs could not be updated; try running\n"
@@ -15894,50 +15895,50 @@ msgstr ""
15895
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
15896
"предизвикват конфликта"
15897
15897
-#: builtin/fetch.c:1344
15898
+#: builtin/fetch.c:1349
15899
#, c-format
15900
msgid " (%s will become dangling)"
15901
msgstr " (обектът „%s“ ще се окаже извън клон)"
15902
15902
-#: builtin/fetch.c:1345
15903
+#: builtin/fetch.c:1350
15904
#, c-format
15905
msgid " (%s has become dangling)"
15906
msgstr " (обектът „%s“ вече е извън клон)"
15907
15907
-#: builtin/fetch.c:1377
15908
+#: builtin/fetch.c:1382
15909
msgid "[deleted]"
15910
msgstr "[изтрит]"
15911
15911
-#: builtin/fetch.c:1378 builtin/remote.c:1128
15912
+#: builtin/fetch.c:1383 builtin/remote.c:1128
15913
msgid "(none)"
15914
msgstr "(нищо)"
15915
15915
-#: builtin/fetch.c:1400
15916
+#: builtin/fetch.c:1405
15917
#, c-format
15918
msgid "refusing to fetch into branch '%s' checked out at '%s'"
15919
msgstr "не може да доставите в клона „%s“, който е изтеглен в пътя „%s“"
15920
15920
-#: builtin/fetch.c:1420
15921
+#: builtin/fetch.c:1425
15922
#, c-format
15923
msgid "option \"%s\" value \"%s\" is not valid for %s"
15924
msgstr "стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
15925
15925
-#: builtin/fetch.c:1423
15926
+#: builtin/fetch.c:1428
15927
#, c-format
15928
msgid "option \"%s\" is ignored for %s\n"
15929
msgstr "опцията „%s“ се прескача при „%s“\n"
15930
15930
-#: builtin/fetch.c:1450
15931
+#: builtin/fetch.c:1455
15932
#, c-format
15933
msgid "the object %s does not exist"
15934
msgstr "обектът „%s“ не съществува"
15935
15935
-#: builtin/fetch.c:1638
15936
+#: builtin/fetch.c:1643
15937
msgid "multiple branches detected, incompatible with --set-upstream"
15938
msgstr ""
15939
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
15940
15940
-#: builtin/fetch.c:1650
15941
+#: builtin/fetch.c:1655
15942
#, c-format
15943
msgid ""
15944
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15946,19 +15947,19 @@ msgstr ""
15947
"следеното от „HEAD“ не може да се смени от „%2$s“ на „%1$s“, защото второто "
15948
"не сочи към никой клон."
15949
15949
-#: builtin/fetch.c:1663
15950
+#: builtin/fetch.c:1668
15951
msgid "not setting upstream for a remote remote-tracking branch"
15952
msgstr "не може да указвате клон за следене на отдалечен етикет"
15953
15953
-#: builtin/fetch.c:1665
15954
+#: builtin/fetch.c:1670
15955
msgid "not setting upstream for a remote tag"
15956
msgstr "не може да указвате клон за следене на отдалечен етикет"
15957
15957
-#: builtin/fetch.c:1667
15958
+#: builtin/fetch.c:1672
15959
msgid "unknown branch type"
15960
msgstr "непознат вид клон"
15961
15961
-#: builtin/fetch.c:1669
15962
+#: builtin/fetch.c:1674
15963
msgid ""
15964
"no source branch found;\n"
15965
"you need to specify exactly one branch with the --set-upstream option"
@@ -15966,22 +15967,22 @@ msgstr ""
15967
"не е открит клон за следене;\n"
15968
"трябва изрично да зададете точно един клон с опцията „--set-upstream“"
15969
15969
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
15970
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
15971
#, c-format
15972
msgid "Fetching %s\n"
15973
msgstr "Доставяне на „%s“\n"
15974
15974
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
15975
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
15976
#, c-format
15977
msgid "could not fetch %s"
15978
msgstr "„%s“ не може да се достави"
15979
15979
-#: builtin/fetch.c:1821
15980
+#: builtin/fetch.c:1826
15981
#, c-format
15982
msgid "could not fetch '%s' (exit code: %d)\n"
15983
msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
15984
15984
-#: builtin/fetch.c:1925
15985
+#: builtin/fetch.c:1930
15986
msgid ""
15987
"no remote repository specified; please specify either a URL or a\n"
15988
"remote name from which new revisions should be fetched"
@@ -15989,49 +15990,49 @@ msgstr ""
15990
"не сте указали отдалечено хранилище; задайте или адрес, или име\n"
15991
"на отдалечено хранилище, откъдето да се доставят новите версии."
15992
15992
-#: builtin/fetch.c:1961
15993
+#: builtin/fetch.c:1966
15994
msgid "you need to specify a tag name"
15995
msgstr "трябва да укажете име на етикет"
15996
15996
-#: builtin/fetch.c:2027
15997
+#: builtin/fetch.c:2032
15998
msgid "--negotiate-only needs one or more --negotiate-tip=*"
15999
msgstr ""
16000
"Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“"
16001
16001
-#: builtin/fetch.c:2031
16002
+#: builtin/fetch.c:2036
16003
msgid "negative depth in --deepen is not supported"
16004
msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
16005
16005
-#: builtin/fetch.c:2040
16006
+#: builtin/fetch.c:2045
16007
msgid "--unshallow on a complete repository does not make sense"
16008
msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище"
16009
16009
-#: builtin/fetch.c:2057
16010
+#: builtin/fetch.c:2062
16011
msgid "fetch --all does not take a repository argument"
16012
msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
16013
16013
-#: builtin/fetch.c:2059
16014
+#: builtin/fetch.c:2064
16015
msgid "fetch --all does not make sense with refspecs"
16016
msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия"
16017
16017
-#: builtin/fetch.c:2068
16018
+#: builtin/fetch.c:2073
16019
#, c-format
16020
msgid "no such remote or remote group: %s"
16021
msgstr "няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
16022
16022
-#: builtin/fetch.c:2076
16023
+#: builtin/fetch.c:2081
16024
msgid "fetching a group and specifying refspecs does not make sense"
16025
msgstr "доставянето на група и указването на версия са несъвместими"
16026
16026
-#: builtin/fetch.c:2092
16027
+#: builtin/fetch.c:2097
16028
msgid "must supply remote when using --negotiate-only"
16029
msgstr "опцията „--negotiate-only“ изисква хранилище"
16030
16030
-#: builtin/fetch.c:2097
16031
+#: builtin/fetch.c:2102
16032
msgid "protocol does not support --negotiate-only, exiting"
16033
msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата"
16034
16034
-#: builtin/fetch.c:2116
16035
+#: builtin/fetch.c:2121
16036
msgid ""
16037
"--filter can only be used with the remote configured in extensions."
16038
"partialclone"
@@ -16039,12 +16040,12 @@ msgstr ""
16040
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
16041
"настройката „extensions.partialclone“"
16042
16042
-#: builtin/fetch.c:2120
16043
+#: builtin/fetch.c:2125
16044
msgid "--atomic can only be used when fetching from one remote"
16045
msgstr ""
16046
"опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
16047
16047
-#: builtin/fetch.c:2124
16048
+#: builtin/fetch.c:2129
16049
msgid "--stdin can only be used when fetching from one remote"
16050
msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище"
16051
po/fr.po
+70
-69
@@ -77,7 +77,7 @@ msgid ""
77
msgstr ""
78
"Project-Id-Version: git\n"
79
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
80
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
80
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
81
"PO-Revision-Date: 2022-01-12 21:11+0100\n"
82
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
83
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
@@ -979,8 +979,8 @@ msgstr "option d'ignorance d'espace non reconnue '%s'"
979
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
980
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
981
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
982
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
983
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
982
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
983
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
984
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
985
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
986
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@@ -2060,7 +2060,7 @@ msgstr "Une branche nommée '%s' existe déjà"
2060
2061
#: branch.c:313
2062
#, c-format
2063
-msgid "cannot force update the branch '%s'checked out at '%s'"
2063
+msgid "cannot force update the branch '%s' checked out at '%s'"
2064
msgstr ""
2065
"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
2066
@@ -5981,7 +5981,7 @@ msgstr "%s : échec de l'insertion dans la base de données"
5981
msgid "%s: unsupported file type"
5982
msgstr "%s : type de fichier non supporté"
5983
5984
-#: object-file.c:2329 builtin/fetch.c:1448
5984
+#: object-file.c:2329 builtin/fetch.c:1453
5985
#, c-format
5986
msgid "%s is not a valid object"
5987
msgstr "%s n'est pas un objet valide"
@@ -7266,41 +7266,41 @@ msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
7266
msgid "update_ref failed for ref '%s': %s"
7267
msgstr "échec de update_ref pour la réf '%s' : %s"
7268
7269
-#: refs.c:2069
7269
+#: refs.c:2067
7270
#, c-format
7271
msgid "multiple updates for ref '%s' not allowed"
7272
msgstr "mises à jour multiples pour la réf '%s' non permises"
7273
7274
-#: refs.c:2152
7274
+#: refs.c:2150
7275
msgid "ref updates forbidden inside quarantine environment"
7276
msgstr "mises à jour des références interdites en environnement de quarantaine"
7277
7278
-#: refs.c:2163
7278
+#: refs.c:2161
7279
msgid "ref updates aborted by hook"
7280
msgstr "mises à jour des références annulées par le crochet"
7281
7282
-#: refs.c:2271 refs.c:2301
7282
+#: refs.c:2269 refs.c:2299
7283
#, c-format
7284
msgid "'%s' exists; cannot create '%s'"
7285
msgstr "'%s' existe ; impossible de créer '%s'"
7286
7287
-#: refs.c:2277 refs.c:2312
7287
+#: refs.c:2275 refs.c:2310
7288
#, c-format
7289
msgid "cannot process '%s' and '%s' at the same time"
7290
msgstr "impossible de traiter '%s' et '%s' en même temps"
7291
7292
-#: refs/files-backend.c:1268
7292
+#: refs/files-backend.c:1267
7293
#, c-format
7294
msgid "could not remove reference %s"
7295
msgstr "impossible de supprimer la référence %s"
7296
7297
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
7297
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
7298
#: refs/packed-backend.c:1559
7299
#, c-format
7300
msgid "could not delete reference %s: %s"
7301
msgstr "impossible de supprimer la référence %s : %s"
7302
7303
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
7303
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
7304
#, c-format
7305
msgid "could not delete references: %s"
7306
msgstr "impossible de supprimer les références : %s"
@@ -8349,7 +8349,8 @@ msgstr "impossible de résoudre HEAD"
8349
msgid "cannot abort from a branch yet to be born"
8350
msgstr "impossible d'abandonner depuis une branche non encore créée"
8351
8352
-#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
8352
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
8353
+#: builtin/grep.c:772
8354
#, c-format
8355
msgid "cannot open '%s'"
8356
msgstr "impossible d'ouvrir '%s'"
@@ -9318,7 +9319,7 @@ msgstr ""
9319
msgid "invalid remote service path"
9320
msgstr "chemin de service distant invalide"
9321
9321
-#: transport-helper.c:661 transport.c:1474
9322
+#: transport-helper.c:661 transport.c:1479
9323
msgid "operation not supported by protocol"
9324
msgstr "option non supportée par le protocole"
9325
@@ -13599,7 +13600,7 @@ msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble"
13600
msgid "repository '%s' does not exist"
13601
msgstr "le dépôt '%s' n'existe pas"
13602
13602
-#: builtin/clone.c:924 builtin/fetch.c:2047
13603
+#: builtin/clone.c:924 builtin/fetch.c:2052
13604
#, c-format
13605
msgid "depth %s is not a positive number"
13606
msgstr "la profondeur %s n'est pas un entier positif"
@@ -15532,71 +15533,71 @@ msgstr "écrire le graphe de commits après le rapatriement"
15533
msgid "accept refspecs from stdin"
15534
msgstr "lire les spécificateurs de référence depuis l'entrée standard"
15535
15535
-#: builtin/fetch.c:587
15536
+#: builtin/fetch.c:592
15537
msgid "couldn't find remote ref HEAD"
15538
msgstr "impossible de trouver la référence HEAD distante"
15539
15539
-#: builtin/fetch.c:761
15540
+#: builtin/fetch.c:766
15541
#, c-format
15542
msgid "configuration fetch.output contains invalid value %s"
15543
msgstr ""
15544
"le paramètre de configuration fetch.output contient une valeur invalide %s"
15545
15545
-#: builtin/fetch.c:862
15546
+#: builtin/fetch.c:867
15547
#, c-format
15548
msgid "object %s not found"
15549
msgstr "objet %s non trouvé"
15550
15550
-#: builtin/fetch.c:866
15551
+#: builtin/fetch.c:871
15552
msgid "[up to date]"
15553
msgstr "[à jour]"
15554
15554
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
15555
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
15556
msgid "[rejected]"
15557
msgstr "[rejeté]"
15558
15558
-#: builtin/fetch.c:880
15559
+#: builtin/fetch.c:885
15560
msgid "can't fetch in current branch"
15561
msgstr "impossible de récupérer dans la branche actuelle"
15562
15562
-#: builtin/fetch.c:881
15563
+#: builtin/fetch.c:886
15564
msgid "checked out in another worktree"
15565
msgstr "extrait dans un autre arbre de travail"
15566
15566
-#: builtin/fetch.c:891
15567
+#: builtin/fetch.c:896
15568
msgid "[tag update]"
15569
msgstr "[mise à jour de l'étiquette]"
15570
15570
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
15571
-#: builtin/fetch.c:963
15571
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
15572
+#: builtin/fetch.c:968
15573
msgid "unable to update local ref"
15574
msgstr "impossible de mettre à jour la référence locale"
15575
15575
-#: builtin/fetch.c:896
15576
+#: builtin/fetch.c:901
15577
msgid "would clobber existing tag"
15578
msgstr "écraserait l'étiquette existante"
15579
15579
-#: builtin/fetch.c:918
15580
+#: builtin/fetch.c:923
15581
msgid "[new tag]"
15582
msgstr "[nouvelle étiquette]"
15583
15583
-#: builtin/fetch.c:921
15584
+#: builtin/fetch.c:926
15585
msgid "[new branch]"
15586
msgstr "[nouvelle branche]"
15587
15587
-#: builtin/fetch.c:924
15588
+#: builtin/fetch.c:929
15589
msgid "[new ref]"
15590
msgstr "[nouvelle référence]"
15591
15591
-#: builtin/fetch.c:963
15592
+#: builtin/fetch.c:968
15593
msgid "forced update"
15594
msgstr "mise à jour forcée"
15595
15595
-#: builtin/fetch.c:968
15596
+#: builtin/fetch.c:973
15597
msgid "non-fast-forward"
15598
msgstr "pas en avance rapide"
15599
15599
-#: builtin/fetch.c:1071
15600
+#: builtin/fetch.c:1076
15601
msgid ""
15602
"fetch normally indicates which branches had a forced update,\n"
15603
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@@ -15606,7 +15607,7 @@ msgstr ""
15607
"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
15608
"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'"
15609
15609
-#: builtin/fetch.c:1075
15610
+#: builtin/fetch.c:1080
15611
#, c-format
15612
msgid ""
15613
"it took %.2f seconds to check forced updates; you can use\n"
@@ -15618,24 +15619,24 @@ msgstr ""
15619
"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
15620
"'git config fetch.showForcedUpdates false' pour éviter cette vérification\n"
15621
15621
-#: builtin/fetch.c:1107
15622
+#: builtin/fetch.c:1112
15623
#, c-format
15624
msgid "%s did not send all necessary objects\n"
15625
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
15626
15626
-#: builtin/fetch.c:1136
15627
+#: builtin/fetch.c:1141
15628
#, c-format
15629
msgid "rejected %s because shallow roots are not allowed to be updated"
15630
msgstr ""
15631
"%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
15632
"permises"
15633
15633
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
15634
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
15635
#, c-format
15636
msgid "From %.*s\n"
15637
msgstr "Depuis %.*s\n"
15638
15638
-#: builtin/fetch.c:1247
15639
+#: builtin/fetch.c:1252
15640
#, c-format
15641
msgid ""
15642
"some local refs could not be updated; try running\n"
@@ -15644,49 +15645,49 @@ msgstr ""
15645
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
15646
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
15647
15647
-#: builtin/fetch.c:1344
15648
+#: builtin/fetch.c:1349
15649
#, c-format
15650
msgid " (%s will become dangling)"
15651
msgstr " (%s sera en suspens)"
15652
15652
-#: builtin/fetch.c:1345
15653
+#: builtin/fetch.c:1350
15654
#, c-format
15655
msgid " (%s has become dangling)"
15656
msgstr " (%s est devenu en suspens)"
15657
15657
-#: builtin/fetch.c:1377
15658
+#: builtin/fetch.c:1382
15659
msgid "[deleted]"
15660
msgstr "[supprimé]"
15661
15661
-#: builtin/fetch.c:1378 builtin/remote.c:1128
15662
+#: builtin/fetch.c:1383 builtin/remote.c:1128
15663
msgid "(none)"
15664
msgstr "(aucun(e))"
15665
15665
-#: builtin/fetch.c:1400
15666
+#: builtin/fetch.c:1405
15667
#, c-format
15668
msgid "refusing to fetch into branch '%s' checked out at '%s'"
15669
msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'"
15670
15670
-#: builtin/fetch.c:1420
15671
+#: builtin/fetch.c:1425
15672
#, c-format
15673
msgid "option \"%s\" value \"%s\" is not valid for %s"
15674
msgstr "la valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
15675
15675
-#: builtin/fetch.c:1423
15676
+#: builtin/fetch.c:1428
15677
#, c-format
15678
msgid "option \"%s\" is ignored for %s\n"
15679
msgstr "l'option \"%s\" est ignorée pour %s\n"
15680
15680
-#: builtin/fetch.c:1450
15681
+#: builtin/fetch.c:1455
15682
#, c-format
15683
msgid "the object %s does not exist"
15684
msgstr "l'objet %s n'existe pas"
15685
15685
-#: builtin/fetch.c:1638
15686
+#: builtin/fetch.c:1643
15687
msgid "multiple branches detected, incompatible with --set-upstream"
15688
msgstr "branches multiples détectées, imcompatible avec --set-upstream"
15689
15689
-#: builtin/fetch.c:1650
15690
+#: builtin/fetch.c:1655
15691
#, c-format
15692
msgid ""
15693
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15695,19 +15696,19 @@ msgstr ""
15696
"impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne "
15697
"pointe sur aucune branche."
15698
15698
-#: builtin/fetch.c:1663
15699
+#: builtin/fetch.c:1668
15700
msgid "not setting upstream for a remote remote-tracking branch"
15701
msgstr "dépôt amont non défini pour la branche de suivi à distance"
15702
15702
-#: builtin/fetch.c:1665
15703
+#: builtin/fetch.c:1670
15704
msgid "not setting upstream for a remote tag"
15705
msgstr "dépôt amont non défini pour l'étiquette distante"
15706
15706
-#: builtin/fetch.c:1667
15707
+#: builtin/fetch.c:1672
15708
msgid "unknown branch type"
15709
msgstr "type de branche inconnu"
15710
15710
-#: builtin/fetch.c:1669
15711
+#: builtin/fetch.c:1674
15712
msgid ""
15713
"no source branch found;\n"
15714
"you need to specify exactly one branch with the --set-upstream option"
@@ -15715,22 +15716,22 @@ msgstr ""
15716
"aucune branche source trouvée.\n"
15717
"Vous devez spécifier exactement une branche avec l'option --set-upstream"
15718
15718
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
15719
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
15720
#, c-format
15721
msgid "Fetching %s\n"
15722
msgstr "Récupération de %s\n"
15723
15723
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
15724
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
15725
#, c-format
15726
msgid "could not fetch %s"
15727
msgstr "impossible de récupérer %s"
15728
15728
-#: builtin/fetch.c:1821
15729
+#: builtin/fetch.c:1826
15730
#, c-format
15731
msgid "could not fetch '%s' (exit code: %d)\n"
15732
msgstr "impossible de récupérer '%s' (code de sortie : %d)\n"
15733
15733
-#: builtin/fetch.c:1925
15734
+#: builtin/fetch.c:1930
15735
msgid ""
15736
"no remote repository specified; please specify either a URL or a\n"
15737
"remote name from which new revisions should be fetched"
@@ -15738,50 +15739,50 @@ msgstr ""
15739
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
15740
"distant depuis lesquels les nouvelles révisions devraient être récupérées"
15741
15741
-#: builtin/fetch.c:1961
15742
+#: builtin/fetch.c:1966
15743
msgid "you need to specify a tag name"
15744
msgstr "Vous devez spécifier un nom d'étiquette"
15745
15745
-#: builtin/fetch.c:2027
15746
+#: builtin/fetch.c:2032
15747
msgid "--negotiate-only needs one or more --negotiate-tip=*"
15748
msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
15749
15749
-#: builtin/fetch.c:2031
15750
+#: builtin/fetch.c:2036
15751
msgid "negative depth in --deepen is not supported"
15752
msgstr "une profondeur négative dans --deepen n'est pas supportée"
15753
15753
-#: builtin/fetch.c:2040
15754
+#: builtin/fetch.c:2045
15755
msgid "--unshallow on a complete repository does not make sense"
15756
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
15757
15757
-#: builtin/fetch.c:2057
15758
+#: builtin/fetch.c:2062
15759
msgid "fetch --all does not take a repository argument"
15760
msgstr "fetch --all n'accepte pas d'argument de dépôt"
15761
15761
-#: builtin/fetch.c:2059
15762
+#: builtin/fetch.c:2064
15763
msgid "fetch --all does not make sense with refspecs"
15764
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
15765
15765
-#: builtin/fetch.c:2068
15766
+#: builtin/fetch.c:2073
15767
#, c-format
15768
msgid "no such remote or remote group: %s"
15769
msgstr "distant ou groupe distant inexistant : %s"
15770
15770
-#: builtin/fetch.c:2076
15771
+#: builtin/fetch.c:2081
15772
msgid "fetching a group and specifying refspecs does not make sense"
15773
msgstr ""
15774
"la récupération d'un groupe avec des spécifications de référence n'a pas de "
15775
"sens"
15776
15776
-#: builtin/fetch.c:2092
15777
+#: builtin/fetch.c:2097
15778
msgid "must supply remote when using --negotiate-only"
15779
msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
15780
15780
-#: builtin/fetch.c:2097
15781
+#: builtin/fetch.c:2102
15782
msgid "protocol does not support --negotiate-only, exiting"
15783
msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon"
15784
15784
-#: builtin/fetch.c:2116
15785
+#: builtin/fetch.c:2121
15786
msgid ""
15787
"--filter can only be used with the remote configured in extensions."
15788
"partialclone"
@@ -15789,11 +15790,11 @@ msgstr ""
15790
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
15791
"extensions.partialclone"
15792
15792
-#: builtin/fetch.c:2120
15793
+#: builtin/fetch.c:2125
15794
msgid "--atomic can only be used when fetching from one remote"
15795
msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant"
15796
15796
-#: builtin/fetch.c:2124
15797
+#: builtin/fetch.c:2129
15798
msgid "--stdin can only be used when fetching from one remote"
15799
msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant"
15800
po/id.po
+101
-84
@@ -7,7 +7,7 @@ msgid ""
7
msgstr ""
8
"Project-Id-Version: Git\n"
9
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
10
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
11
"PO-Revision-Date: 2021-08-14 09:35+0700\n"
12
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
13
"Language-Team: Indonesian\n"
@@ -863,8 +863,8 @@ msgstr "opsi abai spasi putih tidak dikenal '%s'"
863
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
864
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
865
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
866
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
867
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
866
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
867
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
868
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
869
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
870
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@@ -1897,12 +1897,15 @@ msgstr ""
1897
#: branch.c:203
1898
#, c-format
1899
msgid "asked to inherit tracking from '%s', but no remote is set"
1900
-msgstr "diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
1900
+msgstr ""
1901
+"diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
1902
1903
#: branch.c:209
1904
#, c-format
1905
msgid "asked to inherit tracking from '%s', but no merge configuration is set"
1905
-msgstr "diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi penggabungan yang disetel"
1906
+msgstr ""
1907
+"diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi "
1908
+"penggabungan yang disetel"
1909
1910
#: branch.c:252
1911
#, c-format
@@ -1921,13 +1924,15 @@ msgstr "sebuah cabang bernama '%s' sudah ada"
1924
1925
#: branch.c:313
1926
#, c-format
1924
-msgid "cannot force update the branch '%s'checked out at '%s'"
1927
+msgid "cannot force update the branch '%s' checked out at '%s'"
1928
msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
1929
1930
#: branch.c:336
1931
#, c-format
1932
msgid "cannot set up tracking information; starting point '%s' is not a branch"
1930
-msgstr "tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah cabang"
1933
+msgstr ""
1934
+"tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah "
1935
+"cabang"
1936
1937
#: branch.c:338
1938
#, c-format
@@ -3260,14 +3265,16 @@ msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
3265
#: diff.c:4597
3266
#, c-format
3267
msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3263
-msgstr "opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
3268
+msgstr ""
3269
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
3270
3271
#: diff.c:4601
3272
#, c-format
3273
msgid ""
3274
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3275
msgstr ""
3270
-"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' dan '%s'"
3276
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
3277
+"dan '%s'"
3278
3279
#: diff.c:4681
3280
msgid "--follow requires exactly one pathspec"
@@ -5592,7 +5599,7 @@ msgstr ""
5599
msgid "%s: unsupported file type"
5600
msgstr ""
5601
5595
-#: object-file.c:2329 builtin/fetch.c:1448
5602
+#: object-file.c:2329 builtin/fetch.c:1453
5603
#, c-format
5604
msgid "%s is not a valid object"
5605
msgstr ""
@@ -6820,41 +6827,41 @@ msgstr ""
6827
msgid "update_ref failed for ref '%s': %s"
6828
msgstr ""
6829
6823
-#: refs.c:2069
6830
+#: refs.c:2067
6831
#, c-format
6832
msgid "multiple updates for ref '%s' not allowed"
6833
msgstr ""
6834
6828
-#: refs.c:2152
6835
+#: refs.c:2150
6836
msgid "ref updates forbidden inside quarantine environment"
6837
msgstr ""
6838
6832
-#: refs.c:2163
6839
+#: refs.c:2161
6840
msgid "ref updates aborted by hook"
6841
msgstr ""
6842
6836
-#: refs.c:2271 refs.c:2301
6843
+#: refs.c:2269 refs.c:2299
6844
#, c-format
6845
msgid "'%s' exists; cannot create '%s'"
6846
msgstr ""
6847
6841
-#: refs.c:2277 refs.c:2312
6848
+#: refs.c:2275 refs.c:2310
6849
#, c-format
6850
msgid "cannot process '%s' and '%s' at the same time"
6851
msgstr ""
6852
6846
-#: refs/files-backend.c:1268
6853
+#: refs/files-backend.c:1267
6854
#, c-format
6855
msgid "could not remove reference %s"
6856
msgstr ""
6857
6851
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
6858
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
6859
#: refs/packed-backend.c:1559
6860
#, c-format
6861
msgid "could not delete reference %s: %s"
6862
msgstr ""
6863
6857
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
6864
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
6865
#, c-format
6866
msgid "could not delete references: %s"
6867
msgstr ""
@@ -7831,7 +7838,8 @@ msgstr ""
7838
msgid "cannot abort from a branch yet to be born"
7839
msgstr ""
7840
7834
-#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
7841
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
7842
+#: builtin/grep.c:772
7843
#, c-format
7844
msgid "cannot open '%s'"
7845
msgstr ""
@@ -8731,7 +8739,7 @@ msgstr ""
8739
msgid "invalid remote service path"
8740
msgstr ""
8741
8734
-#: transport-helper.c:661 transport.c:1474
8742
+#: transport-helper.c:661 transport.c:1479
8743
msgid "operation not supported by protocol"
8744
msgstr ""
8745
@@ -9539,7 +9547,8 @@ msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)"
9547
msgid ""
9548
" (use \"git am --allow-empty\" to record this patch as an empty commit)"
9549
msgstr ""
9542
-" (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit kosong)"
9550
+" (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit "
9551
+"kosong)"
9552
9553
#: wt-status.c:1239
9554
msgid " (use \"git am --abort\" to restore the original branch)"
@@ -10180,7 +10189,9 @@ msgstr ""
10189
#: builtin/am.c:1159
10190
#, c-format
10191
msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
10183
-msgstr "Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-empty\"."
10192
+msgstr ""
10193
+"Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-"
10194
+"empty\"."
10195
10196
#: builtin/am.c:1161
10197
#, c-format
@@ -12846,7 +12857,7 @@ msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan"
12857
msgid "repository '%s' does not exist"
12858
msgstr "repositori '%s' tidak ada"
12859
12849
-#: builtin/clone.c:924 builtin/fetch.c:2047
12860
+#: builtin/clone.c:924 builtin/fetch.c:2052
12861
#, c-format
12862
msgid "depth %s is not a positive number"
12863
msgstr "kedalaman %s bukan bilangan positif"
@@ -14625,7 +14636,9 @@ msgstr "jumlah submodul yang diambil secara bersamaan"
14636
14637
#: builtin/fetch.c:165
14638
msgid "modify the refspec to place all refs within refs/prefetch/"
14628
-msgstr "modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/prefetch/"
14639
+msgstr ""
14640
+"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/"
14641
+"prefetch/"
14642
14643
#: builtin/fetch.c:167 builtin/pull.c:202
14644
msgid "prune remote-tracking branches no longer on remote"
@@ -14718,81 +14731,82 @@ msgstr "tulis grafik komit setelah pengambilan"
14731
msgid "accept refspecs from stdin"
14732
msgstr "terima spek referensi dari masukan standar"
14733
14721
-#: builtin/fetch.c:587
14734
+#: builtin/fetch.c:592
14735
msgid "couldn't find remote ref HEAD"
14736
msgstr "tidak dapat menemukan referensi remote HEAD"
14737
14725
-#: builtin/fetch.c:761
14738
+#: builtin/fetch.c:766
14739
#, c-format
14740
msgid "configuration fetch.output contains invalid value %s"
14741
msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
14742
14730
-#: builtin/fetch.c:862
14743
+#: builtin/fetch.c:867
14744
#, c-format
14745
msgid "object %s not found"
14746
msgstr "objek %s tidak ditemukan"
14747
14735
-#: builtin/fetch.c:866
14748
+#: builtin/fetch.c:871
14749
msgid "[up to date]"
14750
msgstr "[terkini]"
14751
14739
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
14752
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
14753
msgid "[rejected]"
14754
msgstr "[tertolak]"
14755
14743
-#: builtin/fetch.c:880
14756
+#: builtin/fetch.c:885
14757
msgid "can't fetch in current branch"
14758
msgstr "tidak dapat mengambil di cabang saat ini"
14759
14747
-#: builtin/fetch.c:881
14760
+#: builtin/fetch.c:886
14761
msgid "checked out in another worktree"
14762
msgstr "ter-check out di dalam pohon kerja lainnya"
14763
14751
-#: builtin/fetch.c:891
14764
+#: builtin/fetch.c:896
14765
msgid "[tag update]"
14766
msgstr "[pembaruan tag]"
14767
14755
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
14756
-#: builtin/fetch.c:963
14768
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
14769
+#: builtin/fetch.c:968
14770
msgid "unable to update local ref"
14771
msgstr "tidak dapat memperbarui referensi lokal"
14772
14760
-#: builtin/fetch.c:896
14773
+#: builtin/fetch.c:901
14774
msgid "would clobber existing tag"
14775
msgstr "akan klob tag yang ada"
14776
14764
-#: builtin/fetch.c:918
14777
+#: builtin/fetch.c:923
14778
msgid "[new tag]"
14779
msgstr "[tag baru]"
14780
14768
-#: builtin/fetch.c:921
14781
+#: builtin/fetch.c:926
14782
msgid "[new branch]"
14783
msgstr "[cabang baru]"
14784
14772
-#: builtin/fetch.c:924
14785
+#: builtin/fetch.c:929
14786
msgid "[new ref]"
14787
msgstr "[referensi baru]"
14788
14776
-#: builtin/fetch.c:963
14789
+#: builtin/fetch.c:968
14790
msgid "forced update"
14791
msgstr "pembaruan terpaksa"
14792
14780
-#: builtin/fetch.c:968
14793
+#: builtin/fetch.c:973
14794
msgid "non-fast-forward"
14795
msgstr "bukan-maju-cepat"
14796
14784
-#: builtin/fetch.c:1071
14797
+#: builtin/fetch.c:1076
14798
msgid ""
14799
"fetch normally indicates which branches had a forced update,\n"
14800
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
14801
"flag or run 'git config fetch.showForcedUpdates true'"
14802
msgstr ""
14803
"fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
14791
-"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, gunakan\n"
14792
-"bendera '--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
14793
-"true'."
14804
+"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, "
14805
+"gunakan\n"
14806
+"bendera '--show-forced-updates' atau jalankan 'git config fetch."
14807
+"showForcedUpdates true'."
14808
14795
-#: builtin/fetch.c:1075
14809
+#: builtin/fetch.c:1080
14810
#, c-format
14811
msgid ""
14812
"it took %.2f seconds to check forced updates; you can use\n"
@@ -14805,22 +14819,22 @@ msgstr ""
14819
"'git config fetch.showForcedUpdates false'\n"
14820
"untuk menghindari pemeriksaan ini.\n"
14821
14808
-#: builtin/fetch.c:1107
14822
+#: builtin/fetch.c:1112
14823
#, c-format
14824
msgid "%s did not send all necessary objects\n"
14825
msgstr "%s tidak mengirim semua objek yang diperlukan\n"
14826
14813
-#: builtin/fetch.c:1136
14827
+#: builtin/fetch.c:1141
14828
#, c-format
14829
msgid "rejected %s because shallow roots are not allowed to be updated"
14830
msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
14831
14818
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
14832
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
14833
#, c-format
14834
msgid "From %.*s\n"
14835
msgstr "Dari %.*s\n"
14836
14823
-#: builtin/fetch.c:1247
14837
+#: builtin/fetch.c:1252
14838
#, c-format
14839
msgid ""
14840
"some local refs could not be updated; try running\n"
@@ -14829,70 +14843,70 @@ msgstr ""
14843
"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
14844
" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
14845
14832
-#: builtin/fetch.c:1344
14846
+#: builtin/fetch.c:1349
14847
#, c-format
14848
msgid " (%s will become dangling)"
14849
msgstr " (%s akan menjadi terjuntai)"
14850
14837
-#: builtin/fetch.c:1345
14851
+#: builtin/fetch.c:1350
14852
#, c-format
14853
msgid " (%s has become dangling)"
14854
msgstr " (%s telah menjadi terjuntai)"
14855
14842
-#: builtin/fetch.c:1377
14856
+#: builtin/fetch.c:1382
14857
msgid "[deleted]"
14858
msgstr "[dihapus]"
14859
14846
-#: builtin/fetch.c:1378 builtin/remote.c:1128
14860
+#: builtin/fetch.c:1383 builtin/remote.c:1128
14861
msgid "(none)"
14862
msgstr "(tidak ada)"
14863
14850
-#: builtin/fetch.c:1400
14864
+#: builtin/fetch.c:1405
14865
#, c-format
14866
msgid "refusing to fetch into branch '%s' checked out at '%s'"
14867
msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'"
14868
14855
-#: builtin/fetch.c:1420
14869
+#: builtin/fetch.c:1425
14870
#, c-format
14871
msgid "option \"%s\" value \"%s\" is not valid for %s"
14872
msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
14873
14860
-#: builtin/fetch.c:1423
14874
+#: builtin/fetch.c:1428
14875
#, c-format
14876
msgid "option \"%s\" is ignored for %s\n"
14877
msgstr "opsi \"%s\" diabaikan untuk %s\n"
14878
14865
-#: builtin/fetch.c:1450
14879
+#: builtin/fetch.c:1455
14880
#, c-format
14881
msgid "the object %s does not exist"
14882
msgstr "objek '%s' tidak ada"
14883
14870
-#: builtin/fetch.c:1638
14884
+#: builtin/fetch.c:1643
14885
msgid "multiple branches detected, incompatible with --set-upstream"
14886
msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
14887
14874
-#: builtin/fetch.c:1650
14888
+#: builtin/fetch.c:1655
14889
#, c-format
14890
msgid ""
14891
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
14892
"any branch."
14893
msgstr ""
14880
-"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada cabang "
14881
-"apapun."
14894
+"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada "
14895
+"cabang apapun."
14896
14883
-#: builtin/fetch.c:1663
14897
+#: builtin/fetch.c:1668
14898
msgid "not setting upstream for a remote remote-tracking branch"
14899
msgstr "tidak setel hulu untuk cabang remote pelacak remote"
14900
14887
-#: builtin/fetch.c:1665
14901
+#: builtin/fetch.c:1670
14902
msgid "not setting upstream for a remote tag"
14903
msgstr "tidak setel hulu untuk tag remote"
14904
14891
-#: builtin/fetch.c:1667
14905
+#: builtin/fetch.c:1672
14906
msgid "unknown branch type"
14907
msgstr "tipe cabang tidak diketahui"
14908
14895
-#: builtin/fetch.c:1669
14909
+#: builtin/fetch.c:1674
14910
msgid ""
14911
"no source branch found;\n"
14912
"you need to specify exactly one branch with the --set-upstream option"
@@ -14900,22 +14914,22 @@ msgstr ""
14914
"cabang sumber tidak ditemukan;\n"
14915
"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
14916
14903
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
14917
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
14918
#, c-format
14919
msgid "Fetching %s\n"
14920
msgstr "Mengambil %s\n"
14921
14908
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
14922
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
14923
#, c-format
14924
msgid "could not fetch %s"
14925
msgstr "tidak dapat mengambil %s"
14926
14913
-#: builtin/fetch.c:1821
14927
+#: builtin/fetch.c:1826
14928
#, c-format
14929
msgid "could not fetch '%s' (exit code: %d)\n"
14930
msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
14931
14918
-#: builtin/fetch.c:1925
14932
+#: builtin/fetch.c:1930
14933
msgid ""
14934
"no remote repository specified; please specify either a URL or a\n"
14935
"remote name from which new revisions should be fetched"
@@ -14923,48 +14937,48 @@ msgstr ""
14937
"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
14938
"remote yang mana revisi baru sebaiknya diambil"
14939
14926
-#: builtin/fetch.c:1961
14940
+#: builtin/fetch.c:1966
14941
msgid "you need to specify a tag name"
14942
msgstr "Anda perlu sebutkan sebuah nama tag"
14943
14930
-#: builtin/fetch.c:2027
14944
+#: builtin/fetch.c:2032
14945
msgid "--negotiate-only needs one or more --negotiate-tip=*"
14946
msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
14947
14934
-#: builtin/fetch.c:2031
14948
+#: builtin/fetch.c:2036
14949
msgid "negative depth in --deepen is not supported"
14950
msgstr "kedalaman negatif pada --deepen tidak didukung"
14951
14938
-#: builtin/fetch.c:2040
14952
+#: builtin/fetch.c:2045
14953
msgid "--unshallow on a complete repository does not make sense"
14954
msgstr "--unshallow pada repositori penuh tidak masuk akal"
14955
14942
-#: builtin/fetch.c:2057
14956
+#: builtin/fetch.c:2062
14957
msgid "fetch --all does not take a repository argument"
14958
msgstr "fetch --all tidak mengambil argumen repositori"
14959
14946
-#: builtin/fetch.c:2059
14960
+#: builtin/fetch.c:2064
14961
msgid "fetch --all does not make sense with refspecs"
14962
msgstr "fetch --all tidak masuk akal dengan spek referensi"
14963
14950
-#: builtin/fetch.c:2068
14964
+#: builtin/fetch.c:2073
14965
#, c-format
14966
msgid "no such remote or remote group: %s"
14967
msgstr "tidak ada remote atau grup remote seperti: %s"
14968
14955
-#: builtin/fetch.c:2076
14969
+#: builtin/fetch.c:2081
14970
msgid "fetching a group and specifying refspecs does not make sense"
14971
msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal"
14972
14959
-#: builtin/fetch.c:2092
14973
+#: builtin/fetch.c:2097
14974
msgid "must supply remote when using --negotiate-only"
14975
msgstr "harus suplai remote ketika menggunakan --negotiate-only"
14976
14963
-#: builtin/fetch.c:2097
14977
+#: builtin/fetch.c:2102
14978
msgid "protocol does not support --negotiate-only, exiting"
14979
msgstr "protokol tidak mendukung --negotiate-only, keluar."
14980
14967
-#: builtin/fetch.c:2116
14981
+#: builtin/fetch.c:2121
14982
msgid ""
14983
"--filter can only be used with the remote configured in extensions."
14984
"partialclone"
@@ -14972,11 +14986,11 @@ msgstr ""
14986
"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
14987
"extensions.partialclone"
14988
14975
-#: builtin/fetch.c:2120
14989
+#: builtin/fetch.c:2125
14990
msgid "--atomic can only be used when fetching from one remote"
14991
msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
14992
14979
-#: builtin/fetch.c:2124
14993
+#: builtin/fetch.c:2129
14994
msgid "--stdin can only be used when fetching from one remote"
14995
msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
14996
@@ -18947,7 +18961,8 @@ msgstr ""
18961
" git config pull.ff only # hanya maju cepat\n"
18962
"\n"
18963
"Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n"
18950
-"menyetel preferensi asali untuk semua repositori. Anda juga dapat melewatkan\n"
18964
+"menyetel preferensi asali untuk semua repositori. Anda juga dapat "
18965
+"melewatkan\n"
18966
"--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
18967
"asali terkonfigurasi untuk setiap invokasi.\n"
18968
@@ -21976,7 +21991,9 @@ msgstr ""
21991
21992
#: builtin/stash.c:1474
21993
msgid "Can't use --staged and --include-untracked or --all at the same time"
21979
-msgstr "Tidak dapat menggunakan --staged dan --include-untracked atau --all pada waktu yang bersamaan"
21994
+msgstr ""
21995
+"Tidak dapat menggunakan --staged dan --include-untracked atau --all pada "
21996
+"waktu yang bersamaan"
21997
21998
#: builtin/stash.c:1492
21999
msgid "Did you forget to 'git add'?"
po/sv.po
+69
-74
@@ -7,7 +7,7 @@ msgid ""
7
msgstr ""
8
"Project-Id-Version: git 2.34.0\n"
9
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
10
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
11
"PO-Revision-Date: 2022-01-11 16:34+0100\n"
12
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
13
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -904,8 +904,8 @@ msgstr "okänt alternativ för ignore-whitespace: \"%s\""
904
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
905
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
906
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
907
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
908
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
907
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
908
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
909
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
910
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
911
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@@ -1965,12 +1965,6 @@ msgstr "\"%s\" är inte ett giltigt grennamn"
1965
msgid "a branch named '%s' already exists"
1966
msgstr "det finns redan en gren som heter \"%s\""
1967
1968
-#: branch.c:313
1969
-#, c-format
1970
-msgid "cannot force update the branch '%s'checked out at '%s'"
1971
-msgstr ""
1972
-"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
1973
-
1968
#: branch.c:313
1969
#, c-format
1970
msgid "cannot force update the branch '%s' checked out at '%s'"
@@ -5803,7 +5797,7 @@ msgstr "%s: misslyckades lägga in i databasen"
5797
msgid "%s: unsupported file type"
5798
msgstr "%s: filtypen stöds ej"
5799
5806
-#: object-file.c:2329 builtin/fetch.c:1448
5800
+#: object-file.c:2329 builtin/fetch.c:1453
5801
#, c-format
5802
msgid "%s is not a valid object"
5803
msgstr "%s är inte ett giltigt objekt"
@@ -7076,41 +7070,41 @@ msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
7070
msgid "update_ref failed for ref '%s': %s"
7071
msgstr "update_ref misslyckades för referensen \"%s\": %s"
7072
7079
-#: refs.c:2069
7073
+#: refs.c:2067
7074
#, c-format
7075
msgid "multiple updates for ref '%s' not allowed"
7076
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
7077
7084
-#: refs.c:2152
7078
+#: refs.c:2150
7079
msgid "ref updates forbidden inside quarantine environment"
7080
msgstr "referensuppdateringar förbjudna i karantänmiljö"
7081
7088
-#: refs.c:2163
7082
+#: refs.c:2161
7083
msgid "ref updates aborted by hook"
7084
msgstr "referensuppdateringar avbrutna av krok"
7085
7092
-#: refs.c:2271 refs.c:2301
7086
+#: refs.c:2269 refs.c:2299
7087
#, c-format
7088
msgid "'%s' exists; cannot create '%s'"
7089
msgstr "\"%s\" finns; kan inte skapa \"%s\""
7090
7097
-#: refs.c:2277 refs.c:2312
7091
+#: refs.c:2275 refs.c:2310
7092
#, c-format
7093
msgid "cannot process '%s' and '%s' at the same time"
7094
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
7095
7102
-#: refs/files-backend.c:1268
7096
+#: refs/files-backend.c:1267
7097
#, c-format
7098
msgid "could not remove reference %s"
7099
msgstr "kunde inte ta bort referensen %s"
7100
7107
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
7101
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
7102
#: refs/packed-backend.c:1559
7103
#, c-format
7104
msgid "could not delete reference %s: %s"
7105
msgstr "kunde inte ta bort referensen %s: %s"
7106
7113
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
7107
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
7108
#, c-format
7109
msgid "could not delete references: %s"
7110
msgstr "kunde inte ta bort referenser: %s"
@@ -8141,7 +8135,8 @@ msgstr "kan inte bestämma HEAD"
8135
msgid "cannot abort from a branch yet to be born"
8136
msgstr "kan inte avbryta från en gren som ännu inte är född"
8137
8144
-#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
8138
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
8139
+#: builtin/grep.c:772
8140
#, c-format
8141
msgid "cannot open '%s'"
8142
msgstr "kan inte öppna \"%s\""
@@ -9096,7 +9091,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
9091
msgid "invalid remote service path"
9092
msgstr "felaktig sökväg till fjärrtjänst"
9093
9099
-#: transport-helper.c:661 transport.c:1474
9094
+#: transport-helper.c:661 transport.c:1479
9095
msgid "operation not supported by protocol"
9096
msgstr "funktionen stöds inte av protokollet"
9097
@@ -13300,7 +13295,7 @@ msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt"
13295
msgid "repository '%s' does not exist"
13296
msgstr "arkivet \"%s\" finns inte"
13297
13303
-#: builtin/clone.c:924 builtin/fetch.c:2047
13298
+#: builtin/clone.c:924 builtin/fetch.c:2052
13299
#, c-format
13300
msgid "depth %s is not a positive number"
13301
msgstr "djupet %s är inte ett positivt tal"
@@ -15183,70 +15178,70 @@ msgstr "skriv incheckingsgrafen efter hämtning"
15178
msgid "accept refspecs from stdin"
15179
msgstr "ta emot referenser från standard in"
15180
15186
-#: builtin/fetch.c:587
15181
+#: builtin/fetch.c:592
15182
msgid "couldn't find remote ref HEAD"
15183
msgstr "kunde inte hitta fjärr-referensen HEAD"
15184
15190
-#: builtin/fetch.c:761
15185
+#: builtin/fetch.c:766
15186
#, c-format
15187
msgid "configuration fetch.output contains invalid value %s"
15188
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
15189
15195
-#: builtin/fetch.c:862
15190
+#: builtin/fetch.c:867
15191
#, c-format
15192
msgid "object %s not found"
15193
msgstr "objektet %s hittades inte"
15194
15200
-#: builtin/fetch.c:866
15195
+#: builtin/fetch.c:871
15196
msgid "[up to date]"
15197
msgstr "[àjour]"
15198
15204
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
15199
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
15200
msgid "[rejected]"
15201
msgstr "[refuserad]"
15202
15208
-#: builtin/fetch.c:880
15203
+#: builtin/fetch.c:885
15204
msgid "can't fetch in current branch"
15205
msgstr "kan inte hämta i aktuell gren"
15206
15212
-#: builtin/fetch.c:881
15207
+#: builtin/fetch.c:886
15208
msgid "checked out in another worktree"
15209
msgstr "utcheckat i en annan arbetskatalog"
15210
15216
-#: builtin/fetch.c:891
15211
+#: builtin/fetch.c:896
15212
msgid "[tag update]"
15213
msgstr "[uppdaterad tagg]"
15214
15220
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
15221
-#: builtin/fetch.c:963
15215
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
15216
+#: builtin/fetch.c:968
15217
msgid "unable to update local ref"
15218
msgstr "kunde inte uppdatera lokal ref"
15219
15225
-#: builtin/fetch.c:896
15220
+#: builtin/fetch.c:901
15221
msgid "would clobber existing tag"
15222
msgstr "skulle skriva över befintlig tagg"
15223
15229
-#: builtin/fetch.c:918
15224
+#: builtin/fetch.c:923
15225
msgid "[new tag]"
15226
msgstr "[ny tagg]"
15227
15233
-#: builtin/fetch.c:921
15228
+#: builtin/fetch.c:926
15229
msgid "[new branch]"
15230
msgstr "[ny gren]"
15231
15237
-#: builtin/fetch.c:924
15232
+#: builtin/fetch.c:929
15233
msgid "[new ref]"
15234
msgstr "[ny ref]"
15235
15241
-#: builtin/fetch.c:963
15236
+#: builtin/fetch.c:968
15237
msgid "forced update"
15238
msgstr "tvingad uppdatering"
15239
15245
-#: builtin/fetch.c:968
15240
+#: builtin/fetch.c:973
15241
msgid "non-fast-forward"
15242
msgstr "ej snabbspolad"
15243
15249
-#: builtin/fetch.c:1071
15244
+#: builtin/fetch.c:1076
15245
msgid ""
15246
"fetch normally indicates which branches had a forced update,\n"
15247
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@@ -15257,7 +15252,7 @@ msgstr ""
15252
"av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
15253
"\"git config fetch.showForcedUpdates true\""
15254
15260
-#: builtin/fetch.c:1075
15255
+#: builtin/fetch.c:1080
15256
#, c-format
15257
msgid ""
15258
"it took %.2f seconds to check forced updates; you can use\n"
@@ -15270,22 +15265,22 @@ msgstr ""
15265
"showForcedUpdates\n"
15266
"false\" för att undvika testet\n"
15267
15273
-#: builtin/fetch.c:1107
15268
+#: builtin/fetch.c:1112
15269
#, c-format
15270
msgid "%s did not send all necessary objects\n"
15271
msgstr "%s sände inte alla nödvändiga objekt\n"
15272
15278
-#: builtin/fetch.c:1136
15273
+#: builtin/fetch.c:1141
15274
#, c-format
15275
msgid "rejected %s because shallow roots are not allowed to be updated"
15276
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
15277
15283
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
15278
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
15279
#, c-format
15280
msgid "From %.*s\n"
15281
msgstr "Från %.*s\n"
15282
15288
-#: builtin/fetch.c:1247
15283
+#: builtin/fetch.c:1252
15284
#, c-format
15285
msgid ""
15286
"some local refs could not be updated; try running\n"
@@ -15294,49 +15289,49 @@ msgstr ""
15289
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
15290
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
15291
15297
-#: builtin/fetch.c:1344
15292
+#: builtin/fetch.c:1349
15293
#, c-format
15294
msgid " (%s will become dangling)"
15295
msgstr " (%s kommer bli dinglande)"
15296
15302
-#: builtin/fetch.c:1345
15297
+#: builtin/fetch.c:1350
15298
#, c-format
15299
msgid " (%s has become dangling)"
15300
msgstr " (%s har blivit dinglande)"
15301
15307
-#: builtin/fetch.c:1377
15302
+#: builtin/fetch.c:1382
15303
msgid "[deleted]"
15304
msgstr "[borttagen]"
15305
15311
-#: builtin/fetch.c:1378 builtin/remote.c:1128
15306
+#: builtin/fetch.c:1383 builtin/remote.c:1128
15307
msgid "(none)"
15308
msgstr "(ingen)"
15309
15315
-#: builtin/fetch.c:1400
15310
+#: builtin/fetch.c:1405
15311
#, c-format
15312
msgid "refusing to fetch into branch '%s' checked out at '%s'"
15313
msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
15314
15320
-#: builtin/fetch.c:1420
15315
+#: builtin/fetch.c:1425
15316
#, c-format
15317
msgid "option \"%s\" value \"%s\" is not valid for %s"
15318
msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
15319
15325
-#: builtin/fetch.c:1423
15320
+#: builtin/fetch.c:1428
15321
#, c-format
15322
msgid "option \"%s\" is ignored for %s\n"
15323
msgstr "flaggan \"%s\" ignoreras för %s\n"
15324
15330
-#: builtin/fetch.c:1450
15325
+#: builtin/fetch.c:1455
15326
#, c-format
15327
msgid "the object %s does not exist"
15328
msgstr "objektet %s finns inte"
15329
15335
-#: builtin/fetch.c:1638
15330
+#: builtin/fetch.c:1643
15331
msgid "multiple branches detected, incompatible with --set-upstream"
15332
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
15333
15339
-#: builtin/fetch.c:1650
15334
+#: builtin/fetch.c:1655
15335
#, c-format
15336
msgid ""
15337
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15345,19 +15340,19 @@ msgstr ""
15340
"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
15341
"pekar mot någon gren."
15342
15348
-#: builtin/fetch.c:1663
15343
+#: builtin/fetch.c:1668
15344
msgid "not setting upstream for a remote remote-tracking branch"
15345
msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
15346
15352
-#: builtin/fetch.c:1665
15347
+#: builtin/fetch.c:1670
15348
msgid "not setting upstream for a remote tag"
15349
msgstr "ställer inte in uppström för en fjärrtag"
15350
15356
-#: builtin/fetch.c:1667
15351
+#: builtin/fetch.c:1672
15352
msgid "unknown branch type"
15353
msgstr "okänd grentyp"
15354
15360
-#: builtin/fetch.c:1669
15355
+#: builtin/fetch.c:1674
15356
msgid ""
15357
"no source branch found;\n"
15358
"you need to specify exactly one branch with the --set-upstream option"
@@ -15365,22 +15360,22 @@ msgstr ""
15360
"hittade ingen källgren;\n"
15361
"du måste ange exakt en gren med flaggan --set-upstream"
15362
15368
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
15363
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
15364
#, c-format
15365
msgid "Fetching %s\n"
15366
msgstr "Hämtar %s\n"
15367
15373
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
15368
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
15369
#, c-format
15370
msgid "could not fetch %s"
15371
msgstr "kunde inte hämta %s"
15372
15378
-#: builtin/fetch.c:1821
15373
+#: builtin/fetch.c:1826
15374
#, c-format
15375
msgid "could not fetch '%s' (exit code: %d)\n"
15376
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
15377
15383
-#: builtin/fetch.c:1925
15378
+#: builtin/fetch.c:1930
15379
msgid ""
15380
"no remote repository specified; please specify either a URL or a\n"
15381
"remote name from which new revisions should be fetched"
@@ -15388,48 +15383,48 @@ msgstr ""
15383
"inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n"
15384
"fjärrarkiv som nya incheckningar ska hämtas från"
15385
15391
-#: builtin/fetch.c:1961
15386
+#: builtin/fetch.c:1966
15387
msgid "you need to specify a tag name"
15388
msgstr "du måste ange namnet på en tagg"
15389
15395
-#: builtin/fetch.c:2027
15390
+#: builtin/fetch.c:2032
15391
msgid "--negotiate-only needs one or more --negotiate-tip=*"
15392
msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
15393
15399
-#: builtin/fetch.c:2031
15394
+#: builtin/fetch.c:2036
15395
msgid "negative depth in --deepen is not supported"
15396
msgstr "negativa djup stöds inte i --deepen"
15397
15403
-#: builtin/fetch.c:2040
15398
+#: builtin/fetch.c:2045
15399
msgid "--unshallow on a complete repository does not make sense"
15400
msgstr "--unshallow kan inte användas på ett komplett arkiv"
15401
15407
-#: builtin/fetch.c:2057
15402
+#: builtin/fetch.c:2062
15403
msgid "fetch --all does not take a repository argument"
15404
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
15405
15411
-#: builtin/fetch.c:2059
15406
+#: builtin/fetch.c:2064
15407
msgid "fetch --all does not make sense with refspecs"
15408
msgstr "fetch --all kan inte anges med referensspecifikationer"
15409
15415
-#: builtin/fetch.c:2068
15410
+#: builtin/fetch.c:2073
15411
#, c-format
15412
msgid "no such remote or remote group: %s"
15413
msgstr "fjärren eller fjärrgruppen finns inte: %s"
15414
15420
-#: builtin/fetch.c:2076
15415
+#: builtin/fetch.c:2081
15416
msgid "fetching a group and specifying refspecs does not make sense"
15417
msgstr "kan inte hämta från grupp och ange referensspecifikationer"
15418
15424
-#: builtin/fetch.c:2092
15419
+#: builtin/fetch.c:2097
15420
msgid "must supply remote when using --negotiate-only"
15421
msgstr "måste ange fjärr när --negotiate-only anges"
15422
15428
-#: builtin/fetch.c:2097
15423
+#: builtin/fetch.c:2102
15424
msgid "protocol does not support --negotiate-only, exiting"
15425
msgstr "protokollet stöder inte --negotiate-only, avslutar"
15426
15432
-#: builtin/fetch.c:2116
15427
+#: builtin/fetch.c:2121
15428
msgid ""
15429
"--filter can only be used with the remote configured in extensions."
15430
"partialclone"
@@ -15437,11 +15432,11 @@ msgstr ""
15432
"--filter kan endast användas med fjärren konfigurerad i extensions."
15433
"partialclone"
15434
15440
-#: builtin/fetch.c:2120
15435
+#: builtin/fetch.c:2125
15436
msgid "--atomic can only be used when fetching from one remote"
15437
msgstr "--atomic kan bara användas vid hämtning från en fjärr"
15438
15444
-#: builtin/fetch.c:2124
15439
+#: builtin/fetch.c:2129
15440
msgid "--stdin can only be used when fetching from one remote"
15441
msgstr "--stdin kan bara användas vid hämtning fårn en fjärr"
15442
po/tr.po
+96
-86
@@ -90,7 +90,7 @@ msgid ""
90
msgstr ""
91
"Project-Id-Version: Git Turkish Localization Project\n"
92
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
93
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
93
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
94
"PO-Revision-Date: 2022-01-11 18:00+0300\n"
95
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
96
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
@@ -977,8 +977,8 @@ msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'"
977
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
978
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
979
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
980
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
981
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
980
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
981
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
982
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
983
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
984
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@@ -1966,8 +1966,9 @@ msgstr "%s ikili nesnesi %s yolunda okunamıyor"
1966
msgid ""
1967
"cannot inherit upstream tracking configuration of multiple refs when "
1968
"rebasing is requested"
1969
-msgstr "yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak "
1970
-"izleme yapılandırması miras alınamıyor"
1969
+msgstr ""
1970
+"yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak izleme "
1971
+"yapılandırması miras alınamıyor"
1972
1973
#: branch.c:88
1974
#, c-format
@@ -2007,13 +2008,15 @@ msgstr ""
2008
#: branch.c:203
2009
#, c-format
2010
msgid "asked to inherit tracking from '%s', but no remote is set"
2010
-msgstr "'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
2011
+msgstr ""
2012
+"'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
2013
2014
#: branch.c:209
2015
#, c-format
2016
msgid "asked to inherit tracking from '%s', but no merge configuration is set"
2015
-msgstr "'%s' konumundan izleme miras istendi; ancak bir birleştirme "
2016
-"yapılandırması ayarlanmamış"
2017
+msgstr ""
2018
+"'%s' konumundan izleme miras istendi; ancak bir birleştirme yapılandırması "
2019
+"ayarlanmamış"
2020
2021
#: branch.c:252
2022
#, c-format
@@ -2032,7 +2035,7 @@ msgstr "'%s' adında bir dal halihazırda var"
2035
2036
#: branch.c:313
2037
#, c-format
2035
-msgid "cannot force update the branch '%s'checked out at '%s'"
2038
+msgid "cannot force update the branch '%s' checked out at '%s'"
2039
msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
2040
2041
#: branch.c:336
@@ -3429,15 +3432,17 @@ msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
3432
#: diff.c:4597
3433
#, c-format
3434
msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3432
-msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' "
3433
-"ile kullanın"
3435
+msgstr ""
3436
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
3437
+"kullanın"
3438
3439
#: diff.c:4601
3440
#, c-format
3441
msgid ""
3442
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3439
-msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' "
3440
-"ve '%s' ile kullanın"
3443
+msgstr ""
3444
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
3445
+"ile kullanın"
3446
3447
#: diff.c:4681
3448
msgid "--follow requires exactly one pathspec"
@@ -5867,7 +5872,7 @@ msgstr "%s: veritabanına ekleme başarısız"
5872
msgid "%s: unsupported file type"
5873
msgstr "%s: desteklenmeyen dosya türü"
5874
5870
-#: object-file.c:2329 builtin/fetch.c:1448
5875
+#: object-file.c:2329 builtin/fetch.c:1453
5876
#, c-format
5877
msgid "%s is not a valid object"
5878
msgstr "%s geçerli bir nesne değil"
@@ -7130,41 +7135,41 @@ msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
7135
msgid "update_ref failed for ref '%s': %s"
7136
msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
7137
7133
-#: refs.c:2069
7138
+#: refs.c:2067
7139
#, c-format
7140
msgid "multiple updates for ref '%s' not allowed"
7141
msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
7142
7138
-#: refs.c:2152
7143
+#: refs.c:2150
7144
msgid "ref updates forbidden inside quarantine environment"
7145
msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
7146
7142
-#: refs.c:2163
7147
+#: refs.c:2161
7148
msgid "ref updates aborted by hook"
7149
msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
7150
7146
-#: refs.c:2271 refs.c:2301
7151
+#: refs.c:2269 refs.c:2299
7152
#, c-format
7153
msgid "'%s' exists; cannot create '%s'"
7154
msgstr "'%s' mevcut; '%s' oluşturulamıyor"
7155
7151
-#: refs.c:2277 refs.c:2312
7156
+#: refs.c:2275 refs.c:2310
7157
#, c-format
7158
msgid "cannot process '%s' and '%s' at the same time"
7159
msgstr "'%s' ve '%s' aynı anda işlenemiyor"
7160
7156
-#: refs/files-backend.c:1268
7161
+#: refs/files-backend.c:1267
7162
#, c-format
7163
msgid "could not remove reference %s"
7164
msgstr "%s başvurusu kaldırılamadı"
7165
7161
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
7166
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
7167
#: refs/packed-backend.c:1559
7168
#, c-format
7169
msgid "could not delete reference %s: %s"
7170
msgstr "%s başvurusu silinemedi: %s"
7171
7167
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
7172
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
7173
#, c-format
7174
msgid "could not delete references: %s"
7175
msgstr "başvurular silinemedi: %s"
@@ -8193,7 +8198,8 @@ msgstr "HEAD çözülemiyor"
8198
msgid "cannot abort from a branch yet to be born"
8199
msgstr "daha doğmamış bir daldan iptal edilemiyor"
8200
8196
-#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
8201
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
8202
+#: builtin/grep.c:772
8203
#, c-format
8204
msgid "cannot open '%s'"
8205
msgstr "'%s' açılamıyor"
@@ -9143,7 +9149,7 @@ msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor"
9149
msgid "invalid remote service path"
9150
msgstr "geçersiz uzak konum servis yolu"
9151
9146
-#: transport-helper.c:661 transport.c:1474
9152
+#: transport-helper.c:661 transport.c:1479
9153
msgid "operation not supported by protocol"
9154
msgstr "işlem protokol tarafından desteklenmiyor"
9155
@@ -10667,7 +10673,8 @@ msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın
10673
#: builtin/am.c:1159
10674
#, c-format
10675
msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
10670
-msgstr "Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" "
10676
+msgstr ""
10677
+"Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" "
10678
"çalıştırın."
10679
10680
#: builtin/am.c:1161
@@ -13347,7 +13354,7 @@ msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz"
13354
msgid "repository '%s' does not exist"
13355
msgstr "'%s' deposu mevcut değil"
13356
13350
-#: builtin/clone.c:924 builtin/fetch.c:2047
13357
+#: builtin/clone.c:924 builtin/fetch.c:2052
13358
#, c-format
13359
msgid "depth %s is not a positive number"
13360
msgstr "%s derinliği pozitif bir sayı değil"
@@ -13932,7 +13939,8 @@ msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor."
13939
#: builtin/commit.c:1232
13940
#, c-format
13941
msgid "reword option of '%s' and path '%s' cannot be used together"
13935
-msgstr "'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz"
13942
+msgstr ""
13943
+"'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz"
13944
13945
#: builtin/commit.c:1234
13946
#, c-format
@@ -15248,70 +15256,70 @@ msgstr "getirdikten sonra işleme grafiğini yaz"
15256
msgid "accept refspecs from stdin"
15257
msgstr "başvuru belirteçlerini stdin'den oku"
15258
15251
-#: builtin/fetch.c:587
15259
+#: builtin/fetch.c:592
15260
msgid "couldn't find remote ref HEAD"
15261
msgstr "uzak HEAD başvurusu bulunamadı"
15262
15255
-#: builtin/fetch.c:761
15263
+#: builtin/fetch.c:766
15264
#, c-format
15265
msgid "configuration fetch.output contains invalid value %s"
15266
msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s"
15267
15260
-#: builtin/fetch.c:862
15268
+#: builtin/fetch.c:867
15269
#, c-format
15270
msgid "object %s not found"
15271
msgstr "%s nesnesi bulunamadı"
15272
15265
-#: builtin/fetch.c:866
15273
+#: builtin/fetch.c:871
15274
msgid "[up to date]"
15275
msgstr "[güncel]"
15276
15269
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
15277
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
15278
msgid "[rejected]"
15279
msgstr "[reddedildi]"
15280
15273
-#: builtin/fetch.c:880
15281
+#: builtin/fetch.c:885
15282
msgid "can't fetch in current branch"
15283
msgstr "geçerli dalda getirme yapılamıyor"
15284
15277
-#: builtin/fetch.c:881
15285
+#: builtin/fetch.c:886
15286
msgid "checked out in another worktree"
15287
msgstr "başka bir çalışma ağacında çıkış yapıldı"
15288
15281
-#: builtin/fetch.c:891
15289
+#: builtin/fetch.c:896
15290
msgid "[tag update]"
15291
msgstr "[etiket güncellemesi]"
15292
15285
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
15286
-#: builtin/fetch.c:963
15293
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
15294
+#: builtin/fetch.c:968
15295
msgid "unable to update local ref"
15296
msgstr "yerel başvuru güncellenemiyor"
15297
15290
-#: builtin/fetch.c:896
15298
+#: builtin/fetch.c:901
15299
msgid "would clobber existing tag"
15300
msgstr "var olan etiketi değiştirecektir"
15301
15294
-#: builtin/fetch.c:918
15302
+#: builtin/fetch.c:923
15303
msgid "[new tag]"
15304
msgstr "[yeni etiket]"
15305
15298
-#: builtin/fetch.c:921
15306
+#: builtin/fetch.c:926
15307
msgid "[new branch]"
15308
msgstr "[yeni dal]"
15309
15302
-#: builtin/fetch.c:924
15310
+#: builtin/fetch.c:929
15311
msgid "[new ref]"
15312
msgstr "[yeni başvuru]"
15313
15306
-#: builtin/fetch.c:963
15314
+#: builtin/fetch.c:968
15315
msgid "forced update"
15316
msgstr "zorlanmış güncelleme"
15317
15310
-#: builtin/fetch.c:968
15318
+#: builtin/fetch.c:973
15319
msgid "non-fast-forward"
15320
msgstr "ileri sarım değil"
15321
15314
-#: builtin/fetch.c:1071
15322
+#: builtin/fetch.c:1076
15323
msgid ""
15324
"fetch normally indicates which branches had a forced update,\n"
15325
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@@ -15321,7 +15329,7 @@ msgstr ""
15329
"ancak bu denetleme kapatılmış. Yeniden açmak için '--show-forced-updates'\n"
15330
"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın."
15331
15324
-#: builtin/fetch.c:1075
15332
+#: builtin/fetch.c:1080
15333
#, c-format
15334
msgid ""
15335
"it took %.2f seconds to check forced updates; you can use\n"
@@ -15329,26 +15337,27 @@ msgid ""
15337
"false'\n"
15338
"to avoid this check\n"
15339
msgstr ""
15332
-"Zorla güncellemeleri denetleme %.2f saniye sürdü. '--no-show-forced-updates'\n"
15340
+"Zorla güncellemeleri denetleme %.2f saniye sürdü. '--no-show-forced-"
15341
+"updates'\n"
15342
"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
15343
"bu denetlemeden kaçınabilirsiniz.\n"
15344
15336
-#: builtin/fetch.c:1107
15345
+#: builtin/fetch.c:1112
15346
#, c-format
15347
msgid "%s did not send all necessary objects\n"
15348
msgstr "%s tüm gerekli nesneleri göndermedi\n"
15349
15341
-#: builtin/fetch.c:1136
15350
+#: builtin/fetch.c:1141
15351
#, c-format
15352
msgid "rejected %s because shallow roots are not allowed to be updated"
15353
msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
15354
15346
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
15355
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
15356
#, c-format
15357
msgid "From %.*s\n"
15358
msgstr "Şu konumdan: %.*s\n"
15359
15351
-#: builtin/fetch.c:1247
15360
+#: builtin/fetch.c:1252
15361
#, c-format
15362
msgid ""
15363
"some local refs could not be updated; try running\n"
@@ -15357,49 +15366,49 @@ msgstr ""
15366
"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
15367
"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
15368
15360
-#: builtin/fetch.c:1344
15369
+#: builtin/fetch.c:1349
15370
#, c-format
15371
msgid " (%s will become dangling)"
15372
msgstr " (%s sarkacak)"
15373
15365
-#: builtin/fetch.c:1345
15374
+#: builtin/fetch.c:1350
15375
#, c-format
15376
msgid " (%s has become dangling)"
15377
msgstr " (%s sarkmaya başladı)"
15378
15370
-#: builtin/fetch.c:1377
15379
+#: builtin/fetch.c:1382
15380
msgid "[deleted]"
15381
msgstr "[silindi]"
15382
15374
-#: builtin/fetch.c:1378 builtin/remote.c:1128
15383
+#: builtin/fetch.c:1383 builtin/remote.c:1128
15384
msgid "(none)"
15385
msgstr "(hiçbiri)"
15386
15378
-#: builtin/fetch.c:1400
15387
+#: builtin/fetch.c:1405
15388
#, c-format
15389
msgid "refusing to fetch into branch '%s' checked out at '%s'"
15390
msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı"
15391
15383
-#: builtin/fetch.c:1420
15392
+#: builtin/fetch.c:1425
15393
#, c-format
15394
msgid "option \"%s\" value \"%s\" is not valid for %s"
15395
msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil"
15396
15388
-#: builtin/fetch.c:1423
15397
+#: builtin/fetch.c:1428
15398
#, c-format
15399
msgid "option \"%s\" is ignored for %s\n"
15400
msgstr "\"%s\" seçeneği %s için yok sayılıyor\n"
15401
15393
-#: builtin/fetch.c:1450
15402
+#: builtin/fetch.c:1455
15403
#, c-format
15404
msgid "the object %s does not exist"
15405
msgstr "%s diye bir nesne yok"
15406
15398
-#: builtin/fetch.c:1638
15407
+#: builtin/fetch.c:1643
15408
msgid "multiple branches detected, incompatible with --set-upstream"
15409
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
15410
15402
-#: builtin/fetch.c:1650
15411
+#: builtin/fetch.c:1655
15412
#, c-format
15413
msgid ""
15414
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15408,19 +15417,19 @@ msgstr ""
15417
"HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi "
15418
"bir dala işaret etmiyor."
15419
15411
-#: builtin/fetch.c:1663
15420
+#: builtin/fetch.c:1668
15421
msgid "not setting upstream for a remote remote-tracking branch"
15422
msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor"
15423
15415
-#: builtin/fetch.c:1665
15424
+#: builtin/fetch.c:1670
15425
msgid "not setting upstream for a remote tag"
15426
msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
15427
15419
-#: builtin/fetch.c:1667
15428
+#: builtin/fetch.c:1672
15429
msgid "unknown branch type"
15430
msgstr "bilinmeyen dal türü"
15431
15423
-#: builtin/fetch.c:1669
15432
+#: builtin/fetch.c:1674
15433
msgid ""
15434
"no source branch found;\n"
15435
"you need to specify exactly one branch with the --set-upstream option"
@@ -15428,22 +15437,22 @@ msgstr ""
15437
"Kaynak dal bulunamadı.\n"
15438
"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
15439
15431
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
15440
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
15441
#, c-format
15442
msgid "Fetching %s\n"
15443
msgstr "%s getiriliyor\n"
15444
15436
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
15445
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
15446
#, c-format
15447
msgid "could not fetch %s"
15448
msgstr "%s getirilemedi"
15449
15441
-#: builtin/fetch.c:1821
15450
+#: builtin/fetch.c:1826
15451
#, c-format
15452
msgid "could not fetch '%s' (exit code: %d)\n"
15453
msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
15454
15446
-#: builtin/fetch.c:1925
15455
+#: builtin/fetch.c:1930
15456
msgid ""
15457
"no remote repository specified; please specify either a URL or a\n"
15458
"remote name from which new revisions should be fetched"
@@ -15451,50 +15460,50 @@ msgstr ""
15460
"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
15461
"getirileceği bir URL veya uzak konum adı belirtin."
15462
15454
-#: builtin/fetch.c:1961
15463
+#: builtin/fetch.c:1966
15464
msgid "you need to specify a tag name"
15465
msgstr "bir etiket adı belirtmeniz gerekiyor"
15466
15458
-#: builtin/fetch.c:2027
15467
+#: builtin/fetch.c:2032
15468
msgid "--negotiate-only needs one or more --negotiate-tip=*"
15469
msgstr ""
15470
"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
15471
15463
-#: builtin/fetch.c:2031
15472
+#: builtin/fetch.c:2036
15473
msgid "negative depth in --deepen is not supported"
15474
msgstr "--deepen içinde negatif derinlik desteklenmiyor"
15475
15467
-#: builtin/fetch.c:2040
15476
+#: builtin/fetch.c:2045
15477
msgid "--unshallow on a complete repository does not make sense"
15478
msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
15479
15471
-#: builtin/fetch.c:2057
15480
+#: builtin/fetch.c:2062
15481
msgid "fetch --all does not take a repository argument"
15482
msgstr "fetch --all bir depo argümanı almıyor"
15483
15475
-#: builtin/fetch.c:2059
15484
+#: builtin/fetch.c:2064
15485
msgid "fetch --all does not make sense with refspecs"
15486
msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor"
15487
15479
-#: builtin/fetch.c:2068
15488
+#: builtin/fetch.c:2073
15489
#, c-format
15490
msgid "no such remote or remote group: %s"
15491
msgstr "böyle bir uzak konum veya uzak konum grubu yok: %s"
15492
15484
-#: builtin/fetch.c:2076
15493
+#: builtin/fetch.c:2081
15494
msgid "fetching a group and specifying refspecs does not make sense"
15495
msgstr ""
15496
"bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
15497
15489
-#: builtin/fetch.c:2092
15498
+#: builtin/fetch.c:2097
15499
msgid "must supply remote when using --negotiate-only"
15500
msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
15501
15493
-#: builtin/fetch.c:2097
15502
+#: builtin/fetch.c:2102
15503
msgid "protocol does not support --negotiate-only, exiting"
15504
msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor"
15505
15497
-#: builtin/fetch.c:2116
15506
+#: builtin/fetch.c:2121
15507
msgid ""
15508
"--filter can only be used with the remote configured in extensions."
15509
"partialclone"
@@ -15502,11 +15511,11 @@ msgstr ""
15511
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
15512
"ile kullanılabilir."
15513
15505
-#: builtin/fetch.c:2120
15514
+#: builtin/fetch.c:2125
15515
msgid "--atomic can only be used when fetching from one remote"
15516
msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
15517
15509
-#: builtin/fetch.c:2124
15518
+#: builtin/fetch.c:2129
15519
msgid "--stdin can only be used when fetching from one remote"
15520
msgstr ""
15521
"--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
@@ -22317,8 +22326,9 @@ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
22326
22327
#: builtin/sparse-checkout.c:785
22328
msgid "must be in a sparse-checkout to reapply sparsity patterns"
22320
-msgstr "aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış "
22321
-"içinde olmalı"
22329
+msgstr ""
22330
+"aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış içinde "
22331
+"olmalı"
22332
22333
#: builtin/sparse-checkout.c:803
22334
msgid "git sparse-checkout disable"
@@ -22695,8 +22705,7 @@ msgid ""
22705
"."
22706
msgstr ""
22707
"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
22698
-"sıfır olmayan durum döndürdü"
22699
-"."
22708
+"sıfır olmayan durum döndürdü."
22709
22710
#: builtin/submodule--helper.c:561
22711
msgid "suppress output of entering each submodule command"
@@ -24653,7 +24662,8 @@ msgstr "uzak konum HEAD'i bir dal değil: '%.*s'"
24662
24663
#: contrib/scalar/scalar.c:317
24664
msgid "failed to get default branch name from remote; using local default"
24656
-msgstr "uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
24665
+msgstr ""
24666
+"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
24667
24668
#: contrib/scalar/scalar.c:330
24669
msgid "failed to get default branch name"
po/zh_CN.po
+70
-69
@@ -144,7 +144,7 @@ msgid ""
144
msgstr ""
145
"Project-Id-Version: Git\n"
146
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
147
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
147
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
148
"PO-Revision-Date: 2022-01-11 18:18+0000\n"
149
"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
150
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
@@ -1011,8 +1011,8 @@ msgstr "未能识别的空白字符忽略选项 '%s'"
1011
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
1012
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
1013
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
1014
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
1015
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
1014
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
1015
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
1016
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
1017
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
1018
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@@ -2051,7 +2051,7 @@ msgstr "一个名为 '%s' 的分支已经存在"
2051
2052
#: branch.c:313
2053
#, c-format
2054
-msgid "cannot force update the branch '%s'checked out at '%s'"
2054
+msgid "cannot force update the branch '%s' checked out at '%s'"
2055
msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
2056
2057
#: branch.c:336
@@ -5788,7 +5788,7 @@ msgstr "%s：无法插入数据库"
5788
msgid "%s: unsupported file type"
5789
msgstr "%s：不支持的文件类型"
5790
5791
-#: object-file.c:2329 builtin/fetch.c:1448
5791
+#: object-file.c:2329 builtin/fetch.c:1453
5792
#, c-format
5793
msgid "%s is not a valid object"
5794
msgstr "%s 不是一个有效的对象"
@@ -7037,41 +7037,41 @@ msgstr "拒绝更新有错误名称 '%s' 的引用"
7037
msgid "update_ref failed for ref '%s': %s"
7038
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
7039
7040
-#: refs.c:2069
7040
+#: refs.c:2067
7041
#, c-format
7042
msgid "multiple updates for ref '%s' not allowed"
7043
msgstr "不允许对引用 '%s' 多次更新"
7044
7045
-#: refs.c:2152
7045
+#: refs.c:2150
7046
msgid "ref updates forbidden inside quarantine environment"
7047
msgstr "在隔离环境中禁止更新引用"
7048
7049
-#: refs.c:2163
7049
+#: refs.c:2161
7050
msgid "ref updates aborted by hook"
7051
msgstr "引用更新被钩子中止"
7052
7053
-#: refs.c:2271 refs.c:2301
7053
+#: refs.c:2269 refs.c:2299
7054
#, c-format
7055
msgid "'%s' exists; cannot create '%s'"
7056
msgstr "'%s' 已存在，无法创建 '%s'"
7057
7058
-#: refs.c:2277 refs.c:2312
7058
+#: refs.c:2275 refs.c:2310
7059
#, c-format
7060
msgid "cannot process '%s' and '%s' at the same time"
7061
msgstr "无法同时处理 '%s' 和 '%s'"
7062
7063
-#: refs/files-backend.c:1268
7063
+#: refs/files-backend.c:1267
7064
#, c-format
7065
msgid "could not remove reference %s"
7066
msgstr "无法删除引用 %s"
7067
7068
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
7068
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
7069
#: refs/packed-backend.c:1559
7070
#, c-format
7071
msgid "could not delete reference %s: %s"
7072
msgstr "无法删除引用 %s：%s"
7073
7074
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
7074
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
7075
#, c-format
7076
msgid "could not delete references: %s"
7077
msgstr "无法删除引用：%s"
@@ -8087,7 +8087,8 @@ msgstr "不能解析 HEAD"
8087
msgid "cannot abort from a branch yet to be born"
8088
msgstr "不能从尚未建立的分支终止"
8089
8090
-#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
8090
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
8091
+#: builtin/grep.c:772
8092
#, c-format
8093
msgid "cannot open '%s'"
8094
msgstr "不能打开 '%s'"
@@ -9023,7 +9024,7 @@ msgstr "协议不支持设置远程服务路径"
9024
msgid "invalid remote service path"
9025
msgstr "无效的远程服务路径"
9026
9026
-#: transport-helper.c:661 transport.c:1474
9027
+#: transport-helper.c:661 transport.c:1479
9028
msgid "operation not supported by protocol"
9029
msgstr "协议不支持该操作"
9030
@@ -13190,7 +13191,7 @@ msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
13191
msgid "repository '%s' does not exist"
13192
msgstr "仓库 '%s' 不存在"
13193
13193
-#: builtin/clone.c:924 builtin/fetch.c:2047
13194
+#: builtin/clone.c:924 builtin/fetch.c:2052
13195
#, c-format
13196
msgid "depth %s is not a positive number"
13197
msgstr "深度 %s 不是一个正数"
@@ -15036,70 +15037,70 @@ msgstr "抓取后写提交图"
15037
msgid "accept refspecs from stdin"
15038
msgstr "从标准输入获取引用规格"
15039
15039
-#: builtin/fetch.c:587
15040
+#: builtin/fetch.c:592
15041
msgid "couldn't find remote ref HEAD"
15042
msgstr "无法发现远程 HEAD 引用"
15043
15043
-#: builtin/fetch.c:761
15044
+#: builtin/fetch.c:766
15045
#, c-format
15046
msgid "configuration fetch.output contains invalid value %s"
15047
msgstr "配置变量 fetch.output 包含无效值 %s"
15048
15048
-#: builtin/fetch.c:862
15049
+#: builtin/fetch.c:867
15050
#, c-format
15051
msgid "object %s not found"
15052
msgstr "对象 %s 未发现"
15053
15053
-#: builtin/fetch.c:866
15054
+#: builtin/fetch.c:871
15055
msgid "[up to date]"
15056
msgstr "[最新]"
15057
15057
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
15058
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
15059
msgid "[rejected]"
15060
msgstr "[已拒绝]"
15061
15061
-#: builtin/fetch.c:880
15062
+#: builtin/fetch.c:885
15063
msgid "can't fetch in current branch"
15064
msgstr "当前分支下不能执行获取操作"
15065
15065
-#: builtin/fetch.c:881
15066
+#: builtin/fetch.c:886
15067
msgid "checked out in another worktree"
15068
msgstr "已在另一个工作树中检出"
15069
15069
-#: builtin/fetch.c:891
15070
+#: builtin/fetch.c:896
15071
msgid "[tag update]"
15072
msgstr "[标签更新]"
15073
15073
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
15074
-#: builtin/fetch.c:963
15074
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
15075
+#: builtin/fetch.c:968
15076
msgid "unable to update local ref"
15077
msgstr "不能更新本地引用"
15078
15078
-#: builtin/fetch.c:896
15079
+#: builtin/fetch.c:901
15080
msgid "would clobber existing tag"
15081
msgstr "会破坏现有的标签"
15082
15082
-#: builtin/fetch.c:918
15083
+#: builtin/fetch.c:923
15084
msgid "[new tag]"
15085
msgstr "[新标签]"
15086
15086
-#: builtin/fetch.c:921
15087
+#: builtin/fetch.c:926
15088
msgid "[new branch]"
15089
msgstr "[新分支]"
15090
15090
-#: builtin/fetch.c:924
15091
+#: builtin/fetch.c:929
15092
msgid "[new ref]"
15093
msgstr "[新引用]"
15094
15094
-#: builtin/fetch.c:963
15095
+#: builtin/fetch.c:968
15096
msgid "forced update"
15097
msgstr "强制更新"
15098
15098
-#: builtin/fetch.c:968
15099
+#: builtin/fetch.c:973
15100
msgid "non-fast-forward"
15101
msgstr "非快进"
15102
15102
-#: builtin/fetch.c:1071
15103
+#: builtin/fetch.c:1076
15104
msgid ""
15105
"fetch normally indicates which branches had a forced update,\n"
15106
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@@ -15109,7 +15110,7 @@ msgstr ""
15110
"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
15111
"'git config fetch.showForcedUpdates true'"
15112
15112
-#: builtin/fetch.c:1075
15113
+#: builtin/fetch.c:1080
15114
#, c-format
15115
msgid ""
15116
"it took %.2f seconds to check forced updates; you can use\n"
@@ -15120,22 +15121,22 @@ msgstr ""
15121
"花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n"
15122
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
15123
15123
-#: builtin/fetch.c:1107
15124
+#: builtin/fetch.c:1112
15125
#, c-format
15126
msgid "%s did not send all necessary objects\n"
15127
msgstr "%s 未发送所有必需的对象\n"
15128
15128
-#: builtin/fetch.c:1136
15129
+#: builtin/fetch.c:1141
15130
#, c-format
15131
msgid "rejected %s because shallow roots are not allowed to be updated"
15132
msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
15133
15133
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
15134
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
15135
#, c-format
15136
msgid "From %.*s\n"
15137
msgstr "来自 %.*s\n"
15138
15138
-#: builtin/fetch.c:1247
15139
+#: builtin/fetch.c:1252
15140
#, c-format
15141
msgid ""
15142
"some local refs could not be updated; try running\n"
@@ -15145,69 +15146,69 @@ msgstr ""
15146
" 'git remote prune %s' 来删除旧的、有冲突的分支"
15147
15148
# 译者：注意保持前导空格
15148
-#: builtin/fetch.c:1344
15149
+#: builtin/fetch.c:1349
15150
#, c-format
15151
msgid " (%s will become dangling)"
15152
msgstr " （%s 将成为悬空状态）"
15153
15154
# 译者：注意保持前导空格
15154
-#: builtin/fetch.c:1345
15155
+#: builtin/fetch.c:1350
15156
#, c-format
15157
msgid " (%s has become dangling)"
15158
msgstr " （%s 已成为悬空状态）"
15159
15159
-#: builtin/fetch.c:1377
15160
+#: builtin/fetch.c:1382
15161
msgid "[deleted]"
15162
msgstr "[已删除]"
15163
15163
-#: builtin/fetch.c:1378 builtin/remote.c:1128
15164
+#: builtin/fetch.c:1383 builtin/remote.c:1128
15165
msgid "(none)"
15166
msgstr "（无）"
15167
15167
-#: builtin/fetch.c:1400
15168
+#: builtin/fetch.c:1405
15169
#, c-format
15170
msgid "refusing to fetch into branch '%s' checked out at '%s'"
15171
msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
15172
15172
-#: builtin/fetch.c:1420
15173
+#: builtin/fetch.c:1425
15174
#, c-format
15175
msgid "option \"%s\" value \"%s\" is not valid for %s"
15176
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
15177
15177
-#: builtin/fetch.c:1423
15178
+#: builtin/fetch.c:1428
15179
#, c-format
15180
msgid "option \"%s\" is ignored for %s\n"
15181
msgstr "选项 \"%s\" 为 %s 所忽略\n"
15182
15182
-#: builtin/fetch.c:1450
15183
+#: builtin/fetch.c:1455
15184
#, c-format
15185
msgid "the object %s does not exist"
15186
msgstr "对象 '%s' 不存在"
15187
15187
-#: builtin/fetch.c:1638
15188
+#: builtin/fetch.c:1643
15189
msgid "multiple branches detected, incompatible with --set-upstream"
15190
msgstr "检测到多分支，和 --set-upstream 不兼容"
15191
15191
-#: builtin/fetch.c:1650
15192
+#: builtin/fetch.c:1655
15193
#, c-format
15194
msgid ""
15195
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
15196
"any branch."
15197
msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
15198
15198
-#: builtin/fetch.c:1663
15199
+#: builtin/fetch.c:1668
15200
msgid "not setting upstream for a remote remote-tracking branch"
15201
msgstr "没有为一个远程跟踪分支设置上游"
15202
15202
-#: builtin/fetch.c:1665
15203
+#: builtin/fetch.c:1670
15204
msgid "not setting upstream for a remote tag"
15205
msgstr "没有为一个远程标签设置上游"
15206
15206
-#: builtin/fetch.c:1667
15207
+#: builtin/fetch.c:1672
15208
msgid "unknown branch type"
15209
msgstr "未知的分支类型"
15210
15210
-#: builtin/fetch.c:1669
15211
+#: builtin/fetch.c:1674
15212
msgid ""
15213
"no source branch found;\n"
15214
"you need to specify exactly one branch with the --set-upstream option"
@@ -15215,79 +15216,79 @@ msgstr ""
15216
"未发现源分支；\n"
15217
"您需要使用 --set-upstream 选项指定一个分支"
15218
15218
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
15219
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
15220
#, c-format
15221
msgid "Fetching %s\n"
15222
msgstr "正在获取 %s\n"
15223
15223
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
15224
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
15225
#, c-format
15226
msgid "could not fetch %s"
15227
msgstr "不能获取 %s"
15228
15228
-#: builtin/fetch.c:1821
15229
+#: builtin/fetch.c:1826
15230
#, c-format
15231
msgid "could not fetch '%s' (exit code: %d)\n"
15232
msgstr "无法获取 '%s'（退出码：%d）\n"
15233
15233
-#: builtin/fetch.c:1925
15234
+#: builtin/fetch.c:1930
15235
msgid ""
15236
"no remote repository specified; please specify either a URL or a\n"
15237
"remote name from which new revisions should be fetched"
15238
msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或远程仓库名"
15239
15239
-#: builtin/fetch.c:1961
15240
+#: builtin/fetch.c:1966
15241
msgid "you need to specify a tag name"
15242
msgstr "您需要指定一个标签名称"
15243
15243
-#: builtin/fetch.c:2027
15244
+#: builtin/fetch.c:2032
15245
msgid "--negotiate-only needs one or more --negotiate-tip=*"
15246
msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
15247
15247
-#: builtin/fetch.c:2031
15248
+#: builtin/fetch.c:2036
15249
msgid "negative depth in --deepen is not supported"
15250
msgstr "--deepen 不支持负数深度"
15251
15251
-#: builtin/fetch.c:2040
15252
+#: builtin/fetch.c:2045
15253
msgid "--unshallow on a complete repository does not make sense"
15254
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
15255
15255
-#: builtin/fetch.c:2057
15256
+#: builtin/fetch.c:2062
15257
msgid "fetch --all does not take a repository argument"
15258
msgstr "fetch --all 不能带一个仓库参数"
15259
15259
-#: builtin/fetch.c:2059
15260
+#: builtin/fetch.c:2064
15261
msgid "fetch --all does not make sense with refspecs"
15262
msgstr "fetch --all 带引用规格没有任何意义"
15263
15263
-#: builtin/fetch.c:2068
15264
+#: builtin/fetch.c:2073
15265
#, c-format
15266
msgid "no such remote or remote group: %s"
15267
msgstr "没有这样的远程或远程组：%s"
15268
15268
-#: builtin/fetch.c:2076
15269
+#: builtin/fetch.c:2081
15270
msgid "fetching a group and specifying refspecs does not make sense"
15271
msgstr "获取组并指定引用规格没有意义"
15272
15272
-#: builtin/fetch.c:2092
15273
+#: builtin/fetch.c:2097
15274
msgid "must supply remote when using --negotiate-only"
15275
msgstr "在使用 --negotiate-only 时必须提供远程仓库"
15276
15276
-#: builtin/fetch.c:2097
15277
+#: builtin/fetch.c:2102
15278
msgid "protocol does not support --negotiate-only, exiting"
15279
msgstr "协议不支持 --negotiate-only，退出"
15280
15280
-#: builtin/fetch.c:2116
15281
+#: builtin/fetch.c:2121
15282
msgid ""
15283
"--filter can only be used with the remote configured in extensions."
15284
"partialclone"
15285
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
15286
15286
-#: builtin/fetch.c:2120
15287
+#: builtin/fetch.c:2125
15288
msgid "--atomic can only be used when fetching from one remote"
15289
msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
15290
15290
-#: builtin/fetch.c:2124
15291
+#: builtin/fetch.c:2129
15292
msgid "--stdin can only be used when fetching from one remote"
15293
msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
15294