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>
This commit is contained in:
Jiang Xin
2022-01-17 08:50:41 +08:00
parent fe7f7ad36c
commit ee27abd30d
6 changed files with 476 additions and 451 deletions

139
po/bg.po
View File

@ -187,7 +187,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git 2.34\n" "Project-Id-Version: git 2.34\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2022-01-11 09:38+0800\n" "POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2022-01-16 10:50+0100\n" "PO-Revision-Date: 2022-01-16 10:50+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@ -1095,8 +1095,8 @@ msgstr "непозната опция за игнориране на знаци
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 #: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 #: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 #: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@ -2184,7 +2184,7 @@ msgstr "вече съществува клон с име „%s“."
# FIXME # FIXME
#: branch.c:313 #: branch.c:313
#, c-format #, c-format
msgid "cannot force update the branch '%s'checked out at '%s'" msgid "cannot force update the branch '%s' checked out at '%s'"
msgstr "" msgstr ""
"не може принудително да обновите клона „%s“, който е изтеглен в пътя „%s“" "не може принудително да обновите клона „%s“, който е изтеглен в пътя „%s“"
@ -6121,7 +6121,7 @@ msgstr "„%s“ не може да се вмъкне в базата от да
msgid "%s: unsupported file type" msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“" msgstr "неподдържан вид файл: „%s“"
#: object-file.c:2329 builtin/fetch.c:1448 #: object-file.c:2329 builtin/fetch.c:1453
#, c-format #, c-format
msgid "%s is not a valid object" msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект" msgstr "„%s“ е неправилен обект"
@ -7420,41 +7420,41 @@ msgstr "указател не може да се обнови с грешно и
msgid "update_ref failed for ref '%s': %s" msgid "update_ref failed for ref '%s': %s"
msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s" msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
#: refs.c:2069 #: refs.c:2067
#, c-format #, c-format
msgid "multiple updates for ref '%s' not allowed" msgid "multiple updates for ref '%s' not allowed"
msgstr "не са позволени повече от една промени на указателя „%s“" msgstr "не са позволени повече от една промени на указателя „%s“"
#: refs.c:2152 #: refs.c:2150
msgid "ref updates forbidden inside quarantine environment" msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина" msgstr "обновяванията на указатели са забранени в среди под карантина"
#: refs.c:2163 #: refs.c:2161
msgid "ref updates aborted by hook" msgid "ref updates aborted by hook"
msgstr "обновяванията на указатели са преустановени от кука" msgstr "обновяванията на указатели са преустановени от кука"
#: refs.c:2271 refs.c:2301 #: refs.c:2269 refs.c:2299
#, c-format #, c-format
msgid "'%s' exists; cannot create '%s'" msgid "'%s' exists; cannot create '%s'"
msgstr "„%s“ съществува, не може да се създаде „%s“" msgstr "„%s“ съществува, не може да се създаде „%s“"
#: refs.c:2277 refs.c:2312 #: refs.c:2275 refs.c:2310
#, c-format #, c-format
msgid "cannot process '%s' and '%s' at the same time" msgid "cannot process '%s' and '%s' at the same time"
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“" msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
#: refs/files-backend.c:1268 #: refs/files-backend.c:1267
#, c-format #, c-format
msgid "could not remove reference %s" msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит" msgstr "Указателят „%s“ не може да бъде изтрит"
#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559 #: refs/packed-backend.c:1559
#, c-format #, c-format
msgid "could not delete reference %s: %s" msgid "could not delete reference %s: %s"
msgstr "Указателят „%s“ не може да бъде изтрит: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s"
#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format #, c-format
msgid "could not delete references: %s" msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s" msgstr "Указателите не може да бъдат изтрити: %s"
@ -8533,7 +8533,8 @@ msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва " "действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден" "предстои да бъде създаден"
#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
#: builtin/grep.c:772
#, c-format #, c-format
msgid "cannot open '%s'" msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен" msgstr "„%s“ не може да бъде отворен"
@ -9509,7 +9510,7 @@ msgstr "протоколът не поддържа задаването на п
msgid "invalid remote service path" msgid "invalid remote service path"
msgstr "неправилен път на отдалечената услуга" msgstr "неправилен път на отдалечената услуга"
#: transport-helper.c:661 transport.c:1474 #: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol" msgid "operation not supported by protocol"
msgstr "опцията не се поддържа от протокола" msgstr "опцията не се поддържа от протокола"
@ -13828,7 +13829,7 @@ msgstr "опциите „%s“ и „%s %s“ са несъвместими"
msgid "repository '%s' does not exist" msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“" msgstr "не съществува хранилище „%s“"
#: builtin/clone.c:924 builtin/fetch.c:2047 #: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format #, c-format
msgid "depth %s is not a positive number" msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“" msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
@ -15778,70 +15779,70 @@ msgstr "запазване на гра̀фа с подаванията след
msgid "accept refspecs from stdin" msgid "accept refspecs from stdin"
msgstr "четене на указателите от стандартния вход" msgstr "четене на указателите от стандартния вход"
#: builtin/fetch.c:587 #: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD" msgid "couldn't find remote ref HEAD"
msgstr "указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" msgstr "указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
#: builtin/fetch.c:761 #: builtin/fetch.c:766
#, c-format #, c-format
msgid "configuration fetch.output contains invalid value %s" msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
#: builtin/fetch.c:862 #: builtin/fetch.c:867
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "обектът „%s“ липсва" msgstr "обектът „%s“ липсва"
#: builtin/fetch.c:866 #: builtin/fetch.c:871
msgid "[up to date]" msgid "[up to date]"
msgstr "[актуален]" msgstr "[актуален]"
#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 #: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]" msgid "[rejected]"
msgstr "[отхвърлен]" msgstr "[отхвърлен]"
#: builtin/fetch.c:880 #: builtin/fetch.c:885
msgid "can't fetch in current branch" msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя" msgstr "в текущия клон не може да се доставя"
#: builtin/fetch.c:881 #: builtin/fetch.c:886
msgid "checked out in another worktree" msgid "checked out in another worktree"
msgstr "изтеглен в друго работно дърво" msgstr "изтеглен в друго работно дърво"
#: builtin/fetch.c:891 #: builtin/fetch.c:896
msgid "[tag update]" msgid "[tag update]"
msgstr "[обновяване на етикетите]" msgstr "[обновяване на етикетите]"
#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 #: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен" msgstr "локален указател не може да бъде обновен"
#: builtin/fetch.c:896 #: builtin/fetch.c:901
msgid "would clobber existing tag" msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан" msgstr "съществуващ етикет ще бъде презаписан"
#: builtin/fetch.c:918 #: builtin/fetch.c:923
msgid "[new tag]" msgid "[new tag]"
msgstr "[нов етикет]" msgstr "[нов етикет]"
#: builtin/fetch.c:921 #: builtin/fetch.c:926
msgid "[new branch]" msgid "[new branch]"
msgstr "[нов клон]" msgstr "[нов клон]"
#: builtin/fetch.c:924 #: builtin/fetch.c:929
msgid "[new ref]" msgid "[new ref]"
msgstr "[нов указател]" msgstr "[нов указател]"
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "forced update" msgid "forced update"
msgstr "принудително обновяване" msgstr "принудително обновяване"
#: builtin/fetch.c:968 #: builtin/fetch.c:973
msgid "non-fast-forward" msgid "non-fast-forward"
msgstr "същинско сливане" msgstr "същинско сливане"
#: builtin/fetch.c:1071 #: builtin/fetch.c:1076
msgid "" msgid ""
"fetch normally indicates which branches had a forced update,\n" "fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@ -15854,7 +15855,7 @@ msgstr ""
"\n" "\n"
" git config fetch.showForcedUpdates true" " git config fetch.showForcedUpdates true"
#: builtin/fetch.c:1075 #: builtin/fetch.c:1080
#, c-format #, c-format
msgid "" msgid ""
"it took %.2f seconds to check forced updates; you can use\n" "it took %.2f seconds to check forced updates; you can use\n"
@ -15868,23 +15869,23 @@ msgstr ""
"\n" "\n"
" git config fetch.showForcedUpdates false\n" " git config fetch.showForcedUpdates false\n"
#: builtin/fetch.c:1107 #: builtin/fetch.c:1112
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
#: builtin/fetch.c:1136 #: builtin/fetch.c:1141
#, c-format #, c-format
msgid "rejected %s because shallow roots are not allowed to be updated" msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "" msgstr ""
"отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани" "отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
#: builtin/fetch.c:1226 builtin/fetch.c:1374 #: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "От %.*s\n" msgstr "От %.*s\n"
#: builtin/fetch.c:1247 #: builtin/fetch.c:1252
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
@ -15894,50 +15895,50 @@ msgstr ""
"„git remote prune %s“, за да премахнете остарелите клони, които\n" "„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта" "предизвикват конфликта"
#: builtin/fetch.c:1344 #: builtin/fetch.c:1349
#, c-format #, c-format
msgid " (%s will become dangling)" msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)" msgstr " (обектът „%s“ ще се окаже извън клон)"
#: builtin/fetch.c:1345 #: builtin/fetch.c:1350
#, c-format #, c-format
msgid " (%s has become dangling)" msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)" msgstr " (обектът „%s“ вече е извън клон)"
#: builtin/fetch.c:1377 #: builtin/fetch.c:1382
msgid "[deleted]" msgid "[deleted]"
msgstr "[изтрит]" msgstr "[изтрит]"
#: builtin/fetch.c:1378 builtin/remote.c:1128 #: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)" msgid "(none)"
msgstr "(нищо)" msgstr "(нищо)"
#: builtin/fetch.c:1400 #: builtin/fetch.c:1405
#, c-format #, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'" msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "не може да доставите в клона „%s“, който е изтеглен в пътя „%s“" msgstr "не може да доставите в клона „%s“, който е изтеглен в пътя „%s“"
#: builtin/fetch.c:1420 #: builtin/fetch.c:1425
#, c-format #, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s" msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" msgstr "стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
#: builtin/fetch.c:1423 #: builtin/fetch.c:1428
#, c-format #, c-format
msgid "option \"%s\" is ignored for %s\n" msgid "option \"%s\" is ignored for %s\n"
msgstr "опцията „%s“ се прескача при „%s“\n" msgstr "опцията „%s“ се прескача при „%s“\n"
#: builtin/fetch.c:1450 #: builtin/fetch.c:1455
#, c-format #, c-format
msgid "the object %s does not exist" msgid "the object %s does not exist"
msgstr "обектът „%s“ не съществува" msgstr "обектът „%s“ не съществува"
#: builtin/fetch.c:1638 #: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream" msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "" msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“" "засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
#: builtin/fetch.c:1650 #: builtin/fetch.c:1655
#, c-format #, c-format
msgid "" msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to " "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@ -15946,19 +15947,19 @@ msgstr ""
"следеното от „HEAD“ не може да се смени от „%2$s“ на „%1$s“, защото второто " "следеното от „HEAD“ не може да се смени от „%2$s“ на „%1$s“, защото второто "
"не сочи към никой клон." "не сочи към никой клон."
#: builtin/fetch.c:1663 #: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch" msgid "not setting upstream for a remote remote-tracking branch"
msgstr "не може да указвате клон за следене на отдалечен етикет" msgstr "не може да указвате клон за следене на отдалечен етикет"
#: builtin/fetch.c:1665 #: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag" msgid "not setting upstream for a remote tag"
msgstr "не може да указвате клон за следене на отдалечен етикет" msgstr "не може да указвате клон за следене на отдалечен етикет"
#: builtin/fetch.c:1667 #: builtin/fetch.c:1672
msgid "unknown branch type" msgid "unknown branch type"
msgstr "непознат вид клон" msgstr "непознат вид клон"
#: builtin/fetch.c:1669 #: builtin/fetch.c:1674
msgid "" msgid ""
"no source branch found;\n" "no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option" "you need to specify exactly one branch with the --set-upstream option"
@ -15966,22 +15967,22 @@ msgstr ""
"не е открит клон за следене;\n" "не е открит клон за следене;\n"
"трябва изрично да зададете точно един клон с опцията „--set-upstream“" "трябва изрично да зададете точно един клон с опцията „--set-upstream“"
#: builtin/fetch.c:1799 builtin/fetch.c:1862 #: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n" msgstr "Доставяне на „%s“\n"
#: builtin/fetch.c:1809 builtin/fetch.c:1864 #: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format #, c-format
msgid "could not fetch %s" msgid "could not fetch %s"
msgstr "„%s“ не може да се достави" msgstr "„%s“ не може да се достави"
#: builtin/fetch.c:1821 #: builtin/fetch.c:1826
#, c-format #, c-format
msgid "could not fetch '%s' (exit code: %d)\n" msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "„%s“ не може да се достави (изходният код е: %d)\n" msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
#: builtin/fetch.c:1925 #: builtin/fetch.c:1930
msgid "" msgid ""
"no remote repository specified; please specify either a URL or a\n" "no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched" "remote name from which new revisions should be fetched"
@ -15989,49 +15990,49 @@ msgstr ""
"не сте указали отдалечено хранилище; задайте или адрес, или име\n" "не сте указали отдалечено хранилище; задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии." "на отдалечено хранилище, откъдето да се доставят новите версии."
#: builtin/fetch.c:1961 #: builtin/fetch.c:1966
msgid "you need to specify a tag name" msgid "you need to specify a tag name"
msgstr "трябва да укажете име на етикет" msgstr "трябва да укажете име на етикет"
#: builtin/fetch.c:2027 #: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*" msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "" msgstr ""
"Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“" "Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“"
#: builtin/fetch.c:2031 #: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported" msgid "negative depth in --deepen is not supported"
msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
#: builtin/fetch.c:2040 #: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense" msgid "--unshallow on a complete repository does not make sense"
msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище" msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище"
#: builtin/fetch.c:2057 #: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище" msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
#: builtin/fetch.c:2059 #: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия" msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия"
#: builtin/fetch.c:2068 #: builtin/fetch.c:2073
#, c-format #, c-format
msgid "no such remote or remote group: %s" msgid "no such remote or remote group: %s"
msgstr "няма нито отдалечено хранилище, нито група от хранилища на име „%s“" msgstr "няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
#: builtin/fetch.c:2076 #: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense" msgid "fetching a group and specifying refspecs does not make sense"
msgstr "доставянето на група и указването на версия са несъвместими" msgstr "доставянето на група и указването на версия са несъвместими"
#: builtin/fetch.c:2092 #: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only" msgid "must supply remote when using --negotiate-only"
msgstr "опцията „--negotiate-only“ изисква хранилище" msgstr "опцията „--negotiate-only“ изисква хранилище"
#: builtin/fetch.c:2097 #: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting" msgid "protocol does not support --negotiate-only, exiting"
msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата" msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата"
#: builtin/fetch.c:2116 #: builtin/fetch.c:2121
msgid "" msgid ""
"--filter can only be used with the remote configured in extensions." "--filter can only be used with the remote configured in extensions."
"partialclone" "partialclone"
@ -16039,12 +16040,12 @@ msgstr ""
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в " "опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
"настройката „extensions.partialclone“" "настройката „extensions.partialclone“"
#: builtin/fetch.c:2120 #: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote" msgid "--atomic can only be used when fetching from one remote"
msgstr "" msgstr ""
"опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище" "опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
#: builtin/fetch.c:2124 #: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote" msgid "--stdin can only be used when fetching from one remote"
msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище" msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище"

139
po/fr.po
View File

@ -77,7 +77,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git\n" "Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2022-01-11 09:38+0800\n" "POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2022-01-12 21:11+0100\n" "PO-Revision-Date: 2022-01-12 21:11+0100\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
@ -979,8 +979,8 @@ msgstr "option d'ignorance d'espace non reconnue '%s'"
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 #: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 #: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 #: 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à"
#: branch.c:313 #: branch.c:313
#, c-format #, c-format
msgid "cannot force update the branch '%s'checked out at '%s'" msgid "cannot force update the branch '%s' checked out at '%s'"
msgstr "" msgstr ""
"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'" "impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
@ -5981,7 +5981,7 @@ msgstr "%s : échec de l'insertion dans la base de données"
msgid "%s: unsupported file type" msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté" msgstr "%s : type de fichier non supporté"
#: object-file.c:2329 builtin/fetch.c:1448 #: object-file.c:2329 builtin/fetch.c:1453
#, c-format #, c-format
msgid "%s is not a valid object" msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide" 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'"
msgid "update_ref failed for ref '%s': %s" msgid "update_ref failed for ref '%s': %s"
msgstr "échec de update_ref pour la réf '%s' : %s" msgstr "échec de update_ref pour la réf '%s' : %s"
#: refs.c:2069 #: refs.c:2067
#, c-format #, c-format
msgid "multiple updates for ref '%s' not allowed" msgid "multiple updates for ref '%s' not allowed"
msgstr "mises à jour multiples pour la réf '%s' non permises" msgstr "mises à jour multiples pour la réf '%s' non permises"
#: refs.c:2152 #: refs.c:2150
msgid "ref updates forbidden inside quarantine environment" msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine" msgstr "mises à jour des références interdites en environnement de quarantaine"
#: refs.c:2163 #: refs.c:2161
msgid "ref updates aborted by hook" msgid "ref updates aborted by hook"
msgstr "mises à jour des références annulées par le crochet" msgstr "mises à jour des références annulées par le crochet"
#: refs.c:2271 refs.c:2301 #: refs.c:2269 refs.c:2299
#, c-format #, c-format
msgid "'%s' exists; cannot create '%s'" msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe ; impossible de créer '%s'" msgstr "'%s' existe ; impossible de créer '%s'"
#: refs.c:2277 refs.c:2312 #: refs.c:2275 refs.c:2310
#, c-format #, c-format
msgid "cannot process '%s' and '%s' at the same time" msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossible de traiter '%s' et '%s' en même temps" msgstr "impossible de traiter '%s' et '%s' en même temps"
#: refs/files-backend.c:1268 #: refs/files-backend.c:1267
#, c-format #, c-format
msgid "could not remove reference %s" msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s" msgstr "impossible de supprimer la référence %s"
#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559 #: refs/packed-backend.c:1559
#, c-format #, c-format
msgid "could not delete reference %s: %s" msgid "could not delete reference %s: %s"
msgstr "impossible de supprimer la référence %s : %s" msgstr "impossible de supprimer la référence %s : %s"
#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format #, c-format
msgid "could not delete references: %s" msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s" msgstr "impossible de supprimer les références : %s"
@ -8349,7 +8349,8 @@ msgstr "impossible de résoudre HEAD"
msgid "cannot abort from a branch yet to be born" msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée" msgstr "impossible d'abandonner depuis une branche non encore créée"
#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
#: builtin/grep.c:772
#, c-format #, c-format
msgid "cannot open '%s'" msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'" msgstr "impossible d'ouvrir '%s'"
@ -9318,7 +9319,7 @@ msgstr ""
msgid "invalid remote service path" msgid "invalid remote service path"
msgstr "chemin de service distant invalide" msgstr "chemin de service distant invalide"
#: transport-helper.c:661 transport.c:1474 #: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol" msgid "operation not supported by protocol"
msgstr "option non supportée par le protocole" msgstr "option non supportée par le protocole"
@ -13599,7 +13600,7 @@ msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble"
msgid "repository '%s' does not exist" msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas" msgstr "le dépôt '%s' n'existe pas"
#: builtin/clone.c:924 builtin/fetch.c:2047 #: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format #, c-format
msgid "depth %s is not a positive number" msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif" msgstr "la profondeur %s n'est pas un entier positif"
@ -15532,71 +15533,71 @@ msgstr "écrire le graphe de commits après le rapatriement"
msgid "accept refspecs from stdin" msgid "accept refspecs from stdin"
msgstr "lire les spécificateurs de référence depuis l'entrée standard" msgstr "lire les spécificateurs de référence depuis l'entrée standard"
#: builtin/fetch.c:587 #: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD" msgid "couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante" msgstr "impossible de trouver la référence HEAD distante"
#: builtin/fetch.c:761 #: builtin/fetch.c:766
#, c-format #, c-format
msgid "configuration fetch.output contains invalid value %s" msgid "configuration fetch.output contains invalid value %s"
msgstr "" msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s" "le paramètre de configuration fetch.output contient une valeur invalide %s"
#: builtin/fetch.c:862 #: builtin/fetch.c:867
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "objet %s non trouvé" msgstr "objet %s non trouvé"
#: builtin/fetch.c:866 #: builtin/fetch.c:871
msgid "[up to date]" msgid "[up to date]"
msgstr "[à jour]" msgstr "[à jour]"
#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 #: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]" msgid "[rejected]"
msgstr "[rejeté]" msgstr "[rejeté]"
#: builtin/fetch.c:880 #: builtin/fetch.c:885
msgid "can't fetch in current branch" msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle" msgstr "impossible de récupérer dans la branche actuelle"
#: builtin/fetch.c:881 #: builtin/fetch.c:886
msgid "checked out in another worktree" msgid "checked out in another worktree"
msgstr "extrait dans un autre arbre de travail" msgstr "extrait dans un autre arbre de travail"
#: builtin/fetch.c:891 #: builtin/fetch.c:896
msgid "[tag update]" msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]" msgstr "[mise à jour de l'étiquette]"
#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 #: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale" msgstr "impossible de mettre à jour la référence locale"
#: builtin/fetch.c:896 #: builtin/fetch.c:901
msgid "would clobber existing tag" msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante" msgstr "écraserait l'étiquette existante"
#: builtin/fetch.c:918 #: builtin/fetch.c:923
msgid "[new tag]" msgid "[new tag]"
msgstr "[nouvelle étiquette]" msgstr "[nouvelle étiquette]"
#: builtin/fetch.c:921 #: builtin/fetch.c:926
msgid "[new branch]" msgid "[new branch]"
msgstr "[nouvelle branche]" msgstr "[nouvelle branche]"
#: builtin/fetch.c:924 #: builtin/fetch.c:929
msgid "[new ref]" msgid "[new ref]"
msgstr "[nouvelle référence]" msgstr "[nouvelle référence]"
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "forced update" msgid "forced update"
msgstr "mise à jour forcée" msgstr "mise à jour forcée"
#: builtin/fetch.c:968 #: builtin/fetch.c:973
msgid "non-fast-forward" msgid "non-fast-forward"
msgstr "pas en avance rapide" msgstr "pas en avance rapide"
#: builtin/fetch.c:1071 #: builtin/fetch.c:1076
msgid "" msgid ""
"fetch normally indicates which branches had a forced update,\n" "fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@ -15606,7 +15607,7 @@ msgstr ""
"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'" "'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'"
#: builtin/fetch.c:1075 #: builtin/fetch.c:1080
#, c-format #, c-format
msgid "" msgid ""
"it took %.2f seconds to check forced updates; you can use\n" "it took %.2f seconds to check forced updates; you can use\n"
@ -15618,24 +15619,24 @@ msgstr ""
"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n" "Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
"'git config fetch.showForcedUpdates false' pour éviter cette vérification\n" "'git config fetch.showForcedUpdates false' pour éviter cette vérification\n"
#: builtin/fetch.c:1107 #: builtin/fetch.c:1112
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
#: builtin/fetch.c:1136 #: builtin/fetch.c:1141
#, c-format #, c-format
msgid "rejected %s because shallow roots are not allowed to be updated" msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "" msgstr ""
"%s rejeté parce que les mises à jour de racines superficielles ne sont pas " "%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
"permises" "permises"
#: builtin/fetch.c:1226 builtin/fetch.c:1374 #: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "Depuis %.*s\n" msgstr "Depuis %.*s\n"
#: builtin/fetch.c:1247 #: builtin/fetch.c:1252
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
@ -15644,49 +15645,49 @@ msgstr ""
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit" " 'git remote prune %s' pour supprimer des branches anciennes en conflit"
#: builtin/fetch.c:1344 #: builtin/fetch.c:1349
#, c-format #, c-format
msgid " (%s will become dangling)" msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)" msgstr " (%s sera en suspens)"
#: builtin/fetch.c:1345 #: builtin/fetch.c:1350
#, c-format #, c-format
msgid " (%s has become dangling)" msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)" msgstr " (%s est devenu en suspens)"
#: builtin/fetch.c:1377 #: builtin/fetch.c:1382
msgid "[deleted]" msgid "[deleted]"
msgstr "[supprimé]" msgstr "[supprimé]"
#: builtin/fetch.c:1378 builtin/remote.c:1128 #: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)" msgid "(none)"
msgstr "(aucun(e))" msgstr "(aucun(e))"
#: builtin/fetch.c:1400 #: builtin/fetch.c:1405
#, c-format #, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'" msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'" msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'"
#: builtin/fetch.c:1420 #: builtin/fetch.c:1425
#, c-format #, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s" msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "la valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" msgstr "la valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
#: builtin/fetch.c:1423 #: builtin/fetch.c:1428
#, c-format #, c-format
msgid "option \"%s\" is ignored for %s\n" msgid "option \"%s\" is ignored for %s\n"
msgstr "l'option \"%s\" est ignorée pour %s\n" msgstr "l'option \"%s\" est ignorée pour %s\n"
#: builtin/fetch.c:1450 #: builtin/fetch.c:1455
#, c-format #, c-format
msgid "the object %s does not exist" msgid "the object %s does not exist"
msgstr "l'objet %s n'existe pas" msgstr "l'objet %s n'existe pas"
#: builtin/fetch.c:1638 #: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream" msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "branches multiples détectées, imcompatible avec --set-upstream" msgstr "branches multiples détectées, imcompatible avec --set-upstream"
#: builtin/fetch.c:1650 #: builtin/fetch.c:1655
#, c-format #, c-format
msgid "" msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to " "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@ -15695,19 +15696,19 @@ msgstr ""
"impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne " "impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne "
"pointe sur aucune branche." "pointe sur aucune branche."
#: builtin/fetch.c:1663 #: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch" msgid "not setting upstream for a remote remote-tracking branch"
msgstr "dépôt amont non défini pour la branche de suivi à distance" msgstr "dépôt amont non défini pour la branche de suivi à distance"
#: builtin/fetch.c:1665 #: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag" msgid "not setting upstream for a remote tag"
msgstr "dépôt amont non défini pour l'étiquette distante" msgstr "dépôt amont non défini pour l'étiquette distante"
#: builtin/fetch.c:1667 #: builtin/fetch.c:1672
msgid "unknown branch type" msgid "unknown branch type"
msgstr "type de branche inconnu" msgstr "type de branche inconnu"
#: builtin/fetch.c:1669 #: builtin/fetch.c:1674
msgid "" msgid ""
"no source branch found;\n" "no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option" "you need to specify exactly one branch with the --set-upstream option"
@ -15715,22 +15716,22 @@ msgstr ""
"aucune branche source trouvée.\n" "aucune branche source trouvée.\n"
"Vous devez spécifier exactement une branche avec l'option --set-upstream" "Vous devez spécifier exactement une branche avec l'option --set-upstream"
#: builtin/fetch.c:1799 builtin/fetch.c:1862 #: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "Récupération de %s\n" msgstr "Récupération de %s\n"
#: builtin/fetch.c:1809 builtin/fetch.c:1864 #: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format #, c-format
msgid "could not fetch %s" msgid "could not fetch %s"
msgstr "impossible de récupérer %s" msgstr "impossible de récupérer %s"
#: builtin/fetch.c:1821 #: builtin/fetch.c:1826
#, c-format #, c-format
msgid "could not fetch '%s' (exit code: %d)\n" msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" msgstr "impossible de récupérer '%s' (code de sortie : %d)\n"
#: builtin/fetch.c:1925 #: builtin/fetch.c:1930
msgid "" msgid ""
"no remote repository specified; please specify either a URL or a\n" "no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched" "remote name from which new revisions should be fetched"
@ -15738,50 +15739,50 @@ msgstr ""
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées" "distant depuis lesquels les nouvelles révisions devraient être récupérées"
#: builtin/fetch.c:1961 #: builtin/fetch.c:1966
msgid "you need to specify a tag name" msgid "you need to specify a tag name"
msgstr "Vous devez spécifier un nom d'étiquette" msgstr "Vous devez spécifier un nom d'étiquette"
#: builtin/fetch.c:2027 #: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*" msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*" msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
#: builtin/fetch.c:2031 #: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported" msgid "negative depth in --deepen is not supported"
msgstr "une profondeur négative dans --deepen n'est pas supportée" msgstr "une profondeur négative dans --deepen n'est pas supportée"
#: builtin/fetch.c:2040 #: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense" msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens" msgstr "--unshallow sur un dépôt complet n'a pas de sens"
#: builtin/fetch.c:2057 #: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt" msgstr "fetch --all n'accepte pas d'argument de dépôt"
#: builtin/fetch.c:2059 #: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence" msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
#: builtin/fetch.c:2068 #: builtin/fetch.c:2073
#, c-format #, c-format
msgid "no such remote or remote group: %s" msgid "no such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s" msgstr "distant ou groupe distant inexistant : %s"
#: builtin/fetch.c:2076 #: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense" msgid "fetching a group and specifying refspecs does not make sense"
msgstr "" msgstr ""
"la récupération d'un groupe avec des spécifications de référence n'a pas de " "la récupération d'un groupe avec des spécifications de référence n'a pas de "
"sens" "sens"
#: builtin/fetch.c:2092 #: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only" msgid "must supply remote when using --negotiate-only"
msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only" msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
#: builtin/fetch.c:2097 #: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting" msgid "protocol does not support --negotiate-only, exiting"
msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon" msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon"
#: builtin/fetch.c:2116 #: builtin/fetch.c:2121
msgid "" msgid ""
"--filter can only be used with the remote configured in extensions." "--filter can only be used with the remote configured in extensions."
"partialclone" "partialclone"
@ -15789,11 +15790,11 @@ msgstr ""
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
"extensions.partialclone" "extensions.partialclone"
#: builtin/fetch.c:2120 #: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote" msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant" msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant"
#: builtin/fetch.c:2124 #: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote" msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant" msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant"

185
po/id.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2022-01-11 09:38+0800\n" "POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2021-08-14 09:35+0700\n" "PO-Revision-Date: 2021-08-14 09:35+0700\n"
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
"Language-Team: Indonesian\n" "Language-Team: Indonesian\n"
@ -863,8 +863,8 @@ msgstr "opsi abai spasi putih tidak dikenal '%s'"
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 #: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 #: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 #: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@ -1897,12 +1897,15 @@ msgstr ""
#: branch.c:203 #: branch.c:203
#, c-format #, c-format
msgid "asked to inherit tracking from '%s', but no remote is set" msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr "diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel" msgstr ""
"diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
#: branch.c:209 #: branch.c:209
#, c-format #, c-format
msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr "diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi penggabungan yang disetel" msgstr ""
"diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi "
"penggabungan yang disetel"
#: branch.c:252 #: branch.c:252
#, c-format #, c-format
@ -1921,13 +1924,15 @@ msgstr "sebuah cabang bernama '%s' sudah ada"
#: branch.c:313 #: branch.c:313
#, c-format #, c-format
msgid "cannot force update the branch '%s'checked out at '%s'" msgid "cannot force update the branch '%s' checked out at '%s'"
msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'" msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
#: branch.c:336 #: branch.c:336
#, c-format #, c-format
msgid "cannot set up tracking information; starting point '%s' is not a branch" msgid "cannot set up tracking information; starting point '%s' is not a branch"
msgstr "tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah cabang" msgstr ""
"tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah "
"cabang"
#: branch.c:338 #: branch.c:338
#, c-format #, c-format
@ -3260,14 +3265,16 @@ msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
#: diff.c:4597 #: diff.c:4597
#, c-format #, c-format
msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr "opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'" msgstr ""
"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
#: diff.c:4601 #: diff.c:4601
#, c-format #, c-format
msgid "" msgid ""
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr "" msgstr ""
"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' dan '%s'" "opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
"dan '%s'"
#: diff.c:4681 #: diff.c:4681
msgid "--follow requires exactly one pathspec" msgid "--follow requires exactly one pathspec"
@ -5592,7 +5599,7 @@ msgstr ""
msgid "%s: unsupported file type" msgid "%s: unsupported file type"
msgstr "" msgstr ""
#: object-file.c:2329 builtin/fetch.c:1448 #: object-file.c:2329 builtin/fetch.c:1453
#, c-format #, c-format
msgid "%s is not a valid object" msgid "%s is not a valid object"
msgstr "" msgstr ""
@ -6820,41 +6827,41 @@ msgstr ""
msgid "update_ref failed for ref '%s': %s" msgid "update_ref failed for ref '%s': %s"
msgstr "" msgstr ""
#: refs.c:2069 #: refs.c:2067
#, c-format #, c-format
msgid "multiple updates for ref '%s' not allowed" msgid "multiple updates for ref '%s' not allowed"
msgstr "" msgstr ""
#: refs.c:2152 #: refs.c:2150
msgid "ref updates forbidden inside quarantine environment" msgid "ref updates forbidden inside quarantine environment"
msgstr "" msgstr ""
#: refs.c:2163 #: refs.c:2161
msgid "ref updates aborted by hook" msgid "ref updates aborted by hook"
msgstr "" msgstr ""
#: refs.c:2271 refs.c:2301 #: refs.c:2269 refs.c:2299
#, c-format #, c-format
msgid "'%s' exists; cannot create '%s'" msgid "'%s' exists; cannot create '%s'"
msgstr "" msgstr ""
#: refs.c:2277 refs.c:2312 #: refs.c:2275 refs.c:2310
#, c-format #, c-format
msgid "cannot process '%s' and '%s' at the same time" msgid "cannot process '%s' and '%s' at the same time"
msgstr "" msgstr ""
#: refs/files-backend.c:1268 #: refs/files-backend.c:1267
#, c-format #, c-format
msgid "could not remove reference %s" msgid "could not remove reference %s"
msgstr "" msgstr ""
#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559 #: refs/packed-backend.c:1559
#, c-format #, c-format
msgid "could not delete reference %s: %s" msgid "could not delete reference %s: %s"
msgstr "" msgstr ""
#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format #, c-format
msgid "could not delete references: %s" msgid "could not delete references: %s"
msgstr "" msgstr ""
@ -7831,7 +7838,8 @@ msgstr ""
msgid "cannot abort from a branch yet to be born" msgid "cannot abort from a branch yet to be born"
msgstr "" msgstr ""
#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
#: builtin/grep.c:772
#, c-format #, c-format
msgid "cannot open '%s'" msgid "cannot open '%s'"
msgstr "" msgstr ""
@ -8731,7 +8739,7 @@ msgstr ""
msgid "invalid remote service path" msgid "invalid remote service path"
msgstr "" msgstr ""
#: transport-helper.c:661 transport.c:1474 #: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol" msgid "operation not supported by protocol"
msgstr "" msgstr ""
@ -9539,7 +9547,8 @@ msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)"
msgid "" msgid ""
" (use \"git am --allow-empty\" to record this patch as an empty commit)" " (use \"git am --allow-empty\" to record this patch as an empty commit)"
msgstr "" msgstr ""
" (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit kosong)" " (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit "
"kosong)"
#: wt-status.c:1239 #: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)" msgid " (use \"git am --abort\" to restore the original branch)"
@ -10180,7 +10189,9 @@ msgstr ""
#: builtin/am.c:1159 #: builtin/am.c:1159
#, c-format #, c-format
msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
msgstr "Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-empty\"." msgstr ""
"Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-"
"empty\"."
#: builtin/am.c:1161 #: builtin/am.c:1161
#, c-format #, c-format
@ -12846,7 +12857,7 @@ msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan"
msgid "repository '%s' does not exist" msgid "repository '%s' does not exist"
msgstr "repositori '%s' tidak ada" msgstr "repositori '%s' tidak ada"
#: builtin/clone.c:924 builtin/fetch.c:2047 #: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format #, c-format
msgid "depth %s is not a positive number" msgid "depth %s is not a positive number"
msgstr "kedalaman %s bukan bilangan positif" msgstr "kedalaman %s bukan bilangan positif"
@ -14625,7 +14636,9 @@ msgstr "jumlah submodul yang diambil secara bersamaan"
#: builtin/fetch.c:165 #: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/" msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr "modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/prefetch/" msgstr ""
"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/"
"prefetch/"
#: builtin/fetch.c:167 builtin/pull.c:202 #: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote" msgid "prune remote-tracking branches no longer on remote"
@ -14718,81 +14731,82 @@ msgstr "tulis grafik komit setelah pengambilan"
msgid "accept refspecs from stdin" msgid "accept refspecs from stdin"
msgstr "terima spek referensi dari masukan standar" msgstr "terima spek referensi dari masukan standar"
#: builtin/fetch.c:587 #: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD" msgid "couldn't find remote ref HEAD"
msgstr "tidak dapat menemukan referensi remote HEAD" msgstr "tidak dapat menemukan referensi remote HEAD"
#: builtin/fetch.c:761 #: builtin/fetch.c:766
#, c-format #, c-format
msgid "configuration fetch.output contains invalid value %s" msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurasi fetch.output berisi nilai tidak valid %s" msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
#: builtin/fetch.c:862 #: builtin/fetch.c:867
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "objek %s tidak ditemukan" msgstr "objek %s tidak ditemukan"
#: builtin/fetch.c:866 #: builtin/fetch.c:871
msgid "[up to date]" msgid "[up to date]"
msgstr "[terkini]" msgstr "[terkini]"
#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 #: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]" msgid "[rejected]"
msgstr "[tertolak]" msgstr "[tertolak]"
#: builtin/fetch.c:880 #: builtin/fetch.c:885
msgid "can't fetch in current branch" msgid "can't fetch in current branch"
msgstr "tidak dapat mengambil di cabang saat ini" msgstr "tidak dapat mengambil di cabang saat ini"
#: builtin/fetch.c:881 #: builtin/fetch.c:886
msgid "checked out in another worktree" msgid "checked out in another worktree"
msgstr "ter-check out di dalam pohon kerja lainnya" msgstr "ter-check out di dalam pohon kerja lainnya"
#: builtin/fetch.c:891 #: builtin/fetch.c:896
msgid "[tag update]" msgid "[tag update]"
msgstr "[pembaruan tag]" msgstr "[pembaruan tag]"
#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 #: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "tidak dapat memperbarui referensi lokal" msgstr "tidak dapat memperbarui referensi lokal"
#: builtin/fetch.c:896 #: builtin/fetch.c:901
msgid "would clobber existing tag" msgid "would clobber existing tag"
msgstr "akan klob tag yang ada" msgstr "akan klob tag yang ada"
#: builtin/fetch.c:918 #: builtin/fetch.c:923
msgid "[new tag]" msgid "[new tag]"
msgstr "[tag baru]" msgstr "[tag baru]"
#: builtin/fetch.c:921 #: builtin/fetch.c:926
msgid "[new branch]" msgid "[new branch]"
msgstr "[cabang baru]" msgstr "[cabang baru]"
#: builtin/fetch.c:924 #: builtin/fetch.c:929
msgid "[new ref]" msgid "[new ref]"
msgstr "[referensi baru]" msgstr "[referensi baru]"
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "forced update" msgid "forced update"
msgstr "pembaruan terpaksa" msgstr "pembaruan terpaksa"
#: builtin/fetch.c:968 #: builtin/fetch.c:973
msgid "non-fast-forward" msgid "non-fast-forward"
msgstr "bukan-maju-cepat" msgstr "bukan-maju-cepat"
#: builtin/fetch.c:1071 #: builtin/fetch.c:1076
msgid "" msgid ""
"fetch normally indicates which branches had a forced update,\n" "fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'" "flag or run 'git config fetch.showForcedUpdates true'"
msgstr "" msgstr ""
"fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n" "fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, gunakan\n" "tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, "
"bendera '--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates " "gunakan\n"
"true'." "bendera '--show-forced-updates' atau jalankan 'git config fetch."
"showForcedUpdates true'."
#: builtin/fetch.c:1075 #: builtin/fetch.c:1080
#, c-format #, c-format
msgid "" msgid ""
"it took %.2f seconds to check forced updates; you can use\n" "it took %.2f seconds to check forced updates; you can use\n"
@ -14805,22 +14819,22 @@ msgstr ""
"'git config fetch.showForcedUpdates false'\n" "'git config fetch.showForcedUpdates false'\n"
"untuk menghindari pemeriksaan ini.\n" "untuk menghindari pemeriksaan ini.\n"
#: builtin/fetch.c:1107 #: builtin/fetch.c:1112
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "%s tidak mengirim semua objek yang diperlukan\n" msgstr "%s tidak mengirim semua objek yang diperlukan\n"
#: builtin/fetch.c:1136 #: builtin/fetch.c:1141
#, c-format #, c-format
msgid "rejected %s because shallow roots are not allowed to be updated" msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui" msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
#: builtin/fetch.c:1226 builtin/fetch.c:1374 #: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "Dari %.*s\n" msgstr "Dari %.*s\n"
#: builtin/fetch.c:1247 #: builtin/fetch.c:1252
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
@ -14829,70 +14843,70 @@ msgstr ""
"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n" "beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik" " 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
#: builtin/fetch.c:1344 #: builtin/fetch.c:1349
#, c-format #, c-format
msgid " (%s will become dangling)" msgid " (%s will become dangling)"
msgstr " (%s akan menjadi terjuntai)" msgstr " (%s akan menjadi terjuntai)"
#: builtin/fetch.c:1345 #: builtin/fetch.c:1350
#, c-format #, c-format
msgid " (%s has become dangling)" msgid " (%s has become dangling)"
msgstr " (%s telah menjadi terjuntai)" msgstr " (%s telah menjadi terjuntai)"
#: builtin/fetch.c:1377 #: builtin/fetch.c:1382
msgid "[deleted]" msgid "[deleted]"
msgstr "[dihapus]" msgstr "[dihapus]"
#: builtin/fetch.c:1378 builtin/remote.c:1128 #: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)" msgid "(none)"
msgstr "(tidak ada)" msgstr "(tidak ada)"
#: builtin/fetch.c:1400 #: builtin/fetch.c:1405
#, c-format #, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'" msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'" msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'"
#: builtin/fetch.c:1420 #: builtin/fetch.c:1425
#, c-format #, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s" msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s" msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
#: builtin/fetch.c:1423 #: builtin/fetch.c:1428
#, c-format #, c-format
msgid "option \"%s\" is ignored for %s\n" msgid "option \"%s\" is ignored for %s\n"
msgstr "opsi \"%s\" diabaikan untuk %s\n" msgstr "opsi \"%s\" diabaikan untuk %s\n"
#: builtin/fetch.c:1450 #: builtin/fetch.c:1455
#, c-format #, c-format
msgid "the object %s does not exist" msgid "the object %s does not exist"
msgstr "objek '%s' tidak ada" msgstr "objek '%s' tidak ada"
#: builtin/fetch.c:1638 #: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream" msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream" msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
#: builtin/fetch.c:1650 #: builtin/fetch.c:1655
#, c-format #, c-format
msgid "" msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to " "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
"any branch." "any branch."
msgstr "" msgstr ""
"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada cabang " "tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada "
"apapun." "cabang apapun."
#: builtin/fetch.c:1663 #: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch" msgid "not setting upstream for a remote remote-tracking branch"
msgstr "tidak setel hulu untuk cabang remote pelacak remote" msgstr "tidak setel hulu untuk cabang remote pelacak remote"
#: builtin/fetch.c:1665 #: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag" msgid "not setting upstream for a remote tag"
msgstr "tidak setel hulu untuk tag remote" msgstr "tidak setel hulu untuk tag remote"
#: builtin/fetch.c:1667 #: builtin/fetch.c:1672
msgid "unknown branch type" msgid "unknown branch type"
msgstr "tipe cabang tidak diketahui" msgstr "tipe cabang tidak diketahui"
#: builtin/fetch.c:1669 #: builtin/fetch.c:1674
msgid "" msgid ""
"no source branch found;\n" "no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option" "you need to specify exactly one branch with the --set-upstream option"
@ -14900,22 +14914,22 @@ msgstr ""
"cabang sumber tidak ditemukan;\n" "cabang sumber tidak ditemukan;\n"
"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream." "Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
#: builtin/fetch.c:1799 builtin/fetch.c:1862 #: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "Mengambil %s\n" msgstr "Mengambil %s\n"
#: builtin/fetch.c:1809 builtin/fetch.c:1864 #: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format #, c-format
msgid "could not fetch %s" msgid "could not fetch %s"
msgstr "tidak dapat mengambil %s" msgstr "tidak dapat mengambil %s"
#: builtin/fetch.c:1821 #: builtin/fetch.c:1826
#, c-format #, c-format
msgid "could not fetch '%s' (exit code: %d)\n" msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n" msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
#: builtin/fetch.c:1925 #: builtin/fetch.c:1930
msgid "" msgid ""
"no remote repository specified; please specify either a URL or a\n" "no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched" "remote name from which new revisions should be fetched"
@ -14923,48 +14937,48 @@ msgstr ""
"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n" "repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
"remote yang mana revisi baru sebaiknya diambil" "remote yang mana revisi baru sebaiknya diambil"
#: builtin/fetch.c:1961 #: builtin/fetch.c:1966
msgid "you need to specify a tag name" msgid "you need to specify a tag name"
msgstr "Anda perlu sebutkan sebuah nama tag" msgstr "Anda perlu sebutkan sebuah nama tag"
#: builtin/fetch.c:2027 #: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*" msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*" msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
#: builtin/fetch.c:2031 #: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported" msgid "negative depth in --deepen is not supported"
msgstr "kedalaman negatif pada --deepen tidak didukung" msgstr "kedalaman negatif pada --deepen tidak didukung"
#: builtin/fetch.c:2040 #: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense" msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow pada repositori penuh tidak masuk akal" msgstr "--unshallow pada repositori penuh tidak masuk akal"
#: builtin/fetch.c:2057 #: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tidak mengambil argumen repositori" msgstr "fetch --all tidak mengambil argumen repositori"
#: builtin/fetch.c:2059 #: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all tidak masuk akal dengan spek referensi" msgstr "fetch --all tidak masuk akal dengan spek referensi"
#: builtin/fetch.c:2068 #: builtin/fetch.c:2073
#, c-format #, c-format
msgid "no such remote or remote group: %s" msgid "no such remote or remote group: %s"
msgstr "tidak ada remote atau grup remote seperti: %s" msgstr "tidak ada remote atau grup remote seperti: %s"
#: builtin/fetch.c:2076 #: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense" msgid "fetching a group and specifying refspecs does not make sense"
msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal" msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal"
#: builtin/fetch.c:2092 #: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only" msgid "must supply remote when using --negotiate-only"
msgstr "harus suplai remote ketika menggunakan --negotiate-only" msgstr "harus suplai remote ketika menggunakan --negotiate-only"
#: builtin/fetch.c:2097 #: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting" msgid "protocol does not support --negotiate-only, exiting"
msgstr "protokol tidak mendukung --negotiate-only, keluar." msgstr "protokol tidak mendukung --negotiate-only, keluar."
#: builtin/fetch.c:2116 #: builtin/fetch.c:2121
msgid "" msgid ""
"--filter can only be used with the remote configured in extensions." "--filter can only be used with the remote configured in extensions."
"partialclone" "partialclone"
@ -14972,11 +14986,11 @@ msgstr ""
"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di " "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
"extensions.partialclone" "extensions.partialclone"
#: builtin/fetch.c:2120 #: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote" msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote" msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
#: builtin/fetch.c:2124 #: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote" msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote" msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
@ -18947,7 +18961,8 @@ msgstr ""
" git config pull.ff only # hanya maju cepat\n" " git config pull.ff only # hanya maju cepat\n"
"\n" "\n"
"Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n" "Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n"
"menyetel preferensi asali untuk semua repositori. Anda juga dapat melewatkan\n" "menyetel preferensi asali untuk semua repositori. Anda juga dapat "
"melewatkan\n"
"--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n" "--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
"asali terkonfigurasi untuk setiap invokasi.\n" "asali terkonfigurasi untuk setiap invokasi.\n"
@ -21976,7 +21991,9 @@ msgstr ""
#: builtin/stash.c:1474 #: builtin/stash.c:1474
msgid "Can't use --staged and --include-untracked or --all at the same time" msgid "Can't use --staged and --include-untracked or --all at the same time"
msgstr "Tidak dapat menggunakan --staged dan --include-untracked atau --all pada waktu yang bersamaan" msgstr ""
"Tidak dapat menggunakan --staged dan --include-untracked atau --all pada "
"waktu yang bersamaan"
#: builtin/stash.c:1492 #: builtin/stash.c:1492
msgid "Did you forget to 'git add'?" msgid "Did you forget to 'git add'?"

143
po/sv.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git 2.34.0\n" "Project-Id-Version: git 2.34.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2022-01-11 09:38+0800\n" "POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2022-01-11 16:34+0100\n" "PO-Revision-Date: 2022-01-11 16:34+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@ -904,8 +904,8 @@ msgstr "okänt alternativ för ignore-whitespace: \"%s\""
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 #: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 #: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 #: 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"
msgid "a branch named '%s' already exists" msgid "a branch named '%s' already exists"
msgstr "det finns redan en gren som heter \"%s\"" msgstr "det finns redan en gren som heter \"%s\""
#: branch.c:313
#, c-format
msgid "cannot force update the branch '%s'checked out at '%s'"
msgstr ""
"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
#: branch.c:313 #: branch.c:313
#, c-format #, c-format
msgid "cannot force update the branch '%s' checked out at '%s'" msgid "cannot force update the branch '%s' checked out at '%s'"
@ -5803,7 +5797,7 @@ msgstr "%s: misslyckades lägga in i databasen"
msgid "%s: unsupported file type" msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej" msgstr "%s: filtypen stöds ej"
#: object-file.c:2329 builtin/fetch.c:1448 #: object-file.c:2329 builtin/fetch.c:1453
#, c-format #, c-format
msgid "%s is not a valid object" msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt" msgstr "%s är inte ett giltigt objekt"
@ -7076,41 +7070,41 @@ msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
msgid "update_ref failed for ref '%s': %s" msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s" msgstr "update_ref misslyckades för referensen \"%s\": %s"
#: refs.c:2069 #: refs.c:2067
#, c-format #, c-format
msgid "multiple updates for ref '%s' not allowed" msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
#: refs.c:2152 #: refs.c:2150
msgid "ref updates forbidden inside quarantine environment" msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö" msgstr "referensuppdateringar förbjudna i karantänmiljö"
#: refs.c:2163 #: refs.c:2161
msgid "ref updates aborted by hook" msgid "ref updates aborted by hook"
msgstr "referensuppdateringar avbrutna av krok" msgstr "referensuppdateringar avbrutna av krok"
#: refs.c:2271 refs.c:2301 #: refs.c:2269 refs.c:2299
#, c-format #, c-format
msgid "'%s' exists; cannot create '%s'" msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\"" msgstr "\"%s\" finns; kan inte skapa \"%s\""
#: refs.c:2277 refs.c:2312 #: refs.c:2275 refs.c:2310
#, c-format #, c-format
msgid "cannot process '%s' and '%s' at the same time" msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
#: refs/files-backend.c:1268 #: refs/files-backend.c:1267
#, c-format #, c-format
msgid "could not remove reference %s" msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s" msgstr "kunde inte ta bort referensen %s"
#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559 #: refs/packed-backend.c:1559
#, c-format #, c-format
msgid "could not delete reference %s: %s" msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s" msgstr "kunde inte ta bort referensen %s: %s"
#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format #, c-format
msgid "could not delete references: %s" msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s" msgstr "kunde inte ta bort referenser: %s"
@ -8141,7 +8135,8 @@ msgstr "kan inte bestämma HEAD"
msgid "cannot abort from a branch yet to be born" msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född" msgstr "kan inte avbryta från en gren som ännu inte är född"
#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
#: builtin/grep.c:772
#, c-format #, c-format
msgid "cannot open '%s'" msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\"" msgstr "kan inte öppna \"%s\""
@ -9096,7 +9091,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
msgid "invalid remote service path" msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst" msgstr "felaktig sökväg till fjärrtjänst"
#: transport-helper.c:661 transport.c:1474 #: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol" msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet" msgstr "funktionen stöds inte av protokollet"
@ -13300,7 +13295,7 @@ msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt"
msgid "repository '%s' does not exist" msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte" msgstr "arkivet \"%s\" finns inte"
#: builtin/clone.c:924 builtin/fetch.c:2047 #: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format #, c-format
msgid "depth %s is not a positive number" msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal" msgstr "djupet %s är inte ett positivt tal"
@ -15183,70 +15178,70 @@ msgstr "skriv incheckingsgrafen efter hämtning"
msgid "accept refspecs from stdin" msgid "accept refspecs from stdin"
msgstr "ta emot referenser från standard in" msgstr "ta emot referenser från standard in"
#: builtin/fetch.c:587 #: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD" msgid "couldn't find remote ref HEAD"
msgstr "kunde inte hitta fjärr-referensen HEAD" msgstr "kunde inte hitta fjärr-referensen HEAD"
#: builtin/fetch.c:761 #: builtin/fetch.c:766
#, c-format #, c-format
msgid "configuration fetch.output contains invalid value %s" msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
#: builtin/fetch.c:862 #: builtin/fetch.c:867
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "objektet %s hittades inte" msgstr "objektet %s hittades inte"
#: builtin/fetch.c:866 #: builtin/fetch.c:871
msgid "[up to date]" msgid "[up to date]"
msgstr "[àjour]" msgstr "[àjour]"
#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 #: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]" msgid "[rejected]"
msgstr "[refuserad]" msgstr "[refuserad]"
#: builtin/fetch.c:880 #: builtin/fetch.c:885
msgid "can't fetch in current branch" msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren" msgstr "kan inte hämta i aktuell gren"
#: builtin/fetch.c:881 #: builtin/fetch.c:886
msgid "checked out in another worktree" msgid "checked out in another worktree"
msgstr "utcheckat i en annan arbetskatalog" msgstr "utcheckat i en annan arbetskatalog"
#: builtin/fetch.c:891 #: builtin/fetch.c:896
msgid "[tag update]" msgid "[tag update]"
msgstr "[uppdaterad tagg]" msgstr "[uppdaterad tagg]"
#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 #: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref" msgstr "kunde inte uppdatera lokal ref"
#: builtin/fetch.c:896 #: builtin/fetch.c:901
msgid "would clobber existing tag" msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg" msgstr "skulle skriva över befintlig tagg"
#: builtin/fetch.c:918 #: builtin/fetch.c:923
msgid "[new tag]" msgid "[new tag]"
msgstr "[ny tagg]" msgstr "[ny tagg]"
#: builtin/fetch.c:921 #: builtin/fetch.c:926
msgid "[new branch]" msgid "[new branch]"
msgstr "[ny gren]" msgstr "[ny gren]"
#: builtin/fetch.c:924 #: builtin/fetch.c:929
msgid "[new ref]" msgid "[new ref]"
msgstr "[ny ref]" msgstr "[ny ref]"
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "forced update" msgid "forced update"
msgstr "tvingad uppdatering" msgstr "tvingad uppdatering"
#: builtin/fetch.c:968 #: builtin/fetch.c:973
msgid "non-fast-forward" msgid "non-fast-forward"
msgstr "ej snabbspolad" msgstr "ej snabbspolad"
#: builtin/fetch.c:1071 #: builtin/fetch.c:1076
msgid "" msgid ""
"fetch normally indicates which branches had a forced update,\n" "fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@ -15257,7 +15252,7 @@ msgstr ""
"av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" "av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
"\"git config fetch.showForcedUpdates true\"" "\"git config fetch.showForcedUpdates true\""
#: builtin/fetch.c:1075 #: builtin/fetch.c:1080
#, c-format #, c-format
msgid "" msgid ""
"it took %.2f seconds to check forced updates; you can use\n" "it took %.2f seconds to check forced updates; you can use\n"
@ -15270,22 +15265,22 @@ msgstr ""
"showForcedUpdates\n" "showForcedUpdates\n"
"false\" för att undvika testet\n" "false\" för att undvika testet\n"
#: builtin/fetch.c:1107 #: builtin/fetch.c:1112
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n" msgstr "%s sände inte alla nödvändiga objekt\n"
#: builtin/fetch.c:1136 #: builtin/fetch.c:1141
#, c-format #, c-format
msgid "rejected %s because shallow roots are not allowed to be updated" msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras" msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
#: builtin/fetch.c:1226 builtin/fetch.c:1374 #: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "Från %.*s\n" msgstr "Från %.*s\n"
#: builtin/fetch.c:1247 #: builtin/fetch.c:1252
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
@ -15294,49 +15289,49 @@ msgstr ""
"vissa lokala referenser kunde inte uppdateras; testa att köra\n" "vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
#: builtin/fetch.c:1344 #: builtin/fetch.c:1349
#, c-format #, c-format
msgid " (%s will become dangling)" msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)" msgstr " (%s kommer bli dinglande)"
#: builtin/fetch.c:1345 #: builtin/fetch.c:1350
#, c-format #, c-format
msgid " (%s has become dangling)" msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)" msgstr " (%s har blivit dinglande)"
#: builtin/fetch.c:1377 #: builtin/fetch.c:1382
msgid "[deleted]" msgid "[deleted]"
msgstr "[borttagen]" msgstr "[borttagen]"
#: builtin/fetch.c:1378 builtin/remote.c:1128 #: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)" msgid "(none)"
msgstr "(ingen)" msgstr "(ingen)"
#: builtin/fetch.c:1400 #: builtin/fetch.c:1405
#, c-format #, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'" msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\"" msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
#: builtin/fetch.c:1420 #: builtin/fetch.c:1425
#, c-format #, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s" msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s" msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
#: builtin/fetch.c:1423 #: builtin/fetch.c:1428
#, c-format #, c-format
msgid "option \"%s\" is ignored for %s\n" msgid "option \"%s\" is ignored for %s\n"
msgstr "flaggan \"%s\" ignoreras för %s\n" msgstr "flaggan \"%s\" ignoreras för %s\n"
#: builtin/fetch.c:1450 #: builtin/fetch.c:1455
#, c-format #, c-format
msgid "the object %s does not exist" msgid "the object %s does not exist"
msgstr "objektet %s finns inte" msgstr "objektet %s finns inte"
#: builtin/fetch.c:1638 #: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream" msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
#: builtin/fetch.c:1650 #: builtin/fetch.c:1655
#, c-format #, c-format
msgid "" msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to " "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@ -15345,19 +15340,19 @@ msgstr ""
"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte " "kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
"pekar mot någon gren." "pekar mot någon gren."
#: builtin/fetch.c:1663 #: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch" msgid "not setting upstream for a remote remote-tracking branch"
msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
#: builtin/fetch.c:1665 #: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag" msgid "not setting upstream for a remote tag"
msgstr "ställer inte in uppström för en fjärrtag" msgstr "ställer inte in uppström för en fjärrtag"
#: builtin/fetch.c:1667 #: builtin/fetch.c:1672
msgid "unknown branch type" msgid "unknown branch type"
msgstr "okänd grentyp" msgstr "okänd grentyp"
#: builtin/fetch.c:1669 #: builtin/fetch.c:1674
msgid "" msgid ""
"no source branch found;\n" "no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option" "you need to specify exactly one branch with the --set-upstream option"
@ -15365,22 +15360,22 @@ msgstr ""
"hittade ingen källgren;\n" "hittade ingen källgren;\n"
"du måste ange exakt en gren med flaggan --set-upstream" "du måste ange exakt en gren med flaggan --set-upstream"
#: builtin/fetch.c:1799 builtin/fetch.c:1862 #: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "Hämtar %s\n" msgstr "Hämtar %s\n"
#: builtin/fetch.c:1809 builtin/fetch.c:1864 #: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format #, c-format
msgid "could not fetch %s" msgid "could not fetch %s"
msgstr "kunde inte hämta %s" msgstr "kunde inte hämta %s"
#: builtin/fetch.c:1821 #: builtin/fetch.c:1826
#, c-format #, c-format
msgid "could not fetch '%s' (exit code: %d)\n" msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
#: builtin/fetch.c:1925 #: builtin/fetch.c:1930
msgid "" msgid ""
"no remote repository specified; please specify either a URL or a\n" "no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched" "remote name from which new revisions should be fetched"
@ -15388,48 +15383,48 @@ msgstr ""
"inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n" "inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar ska hämtas från" "fjärrarkiv som nya incheckningar ska hämtas från"
#: builtin/fetch.c:1961 #: builtin/fetch.c:1966
msgid "you need to specify a tag name" msgid "you need to specify a tag name"
msgstr "du måste ange namnet på en tagg" msgstr "du måste ange namnet på en tagg"
#: builtin/fetch.c:2027 #: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*" msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*" msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
#: builtin/fetch.c:2031 #: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported" msgid "negative depth in --deepen is not supported"
msgstr "negativa djup stöds inte i --deepen" msgstr "negativa djup stöds inte i --deepen"
#: builtin/fetch.c:2040 #: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense" msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv" msgstr "--unshallow kan inte användas på ett komplett arkiv"
#: builtin/fetch.c:2057 #: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument"
#: builtin/fetch.c:2059 #: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer" msgstr "fetch --all kan inte anges med referensspecifikationer"
#: builtin/fetch.c:2068 #: builtin/fetch.c:2073
#, c-format #, c-format
msgid "no such remote or remote group: %s" msgid "no such remote or remote group: %s"
msgstr "fjärren eller fjärrgruppen finns inte: %s" msgstr "fjärren eller fjärrgruppen finns inte: %s"
#: builtin/fetch.c:2076 #: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense" msgid "fetching a group and specifying refspecs does not make sense"
msgstr "kan inte hämta från grupp och ange referensspecifikationer" msgstr "kan inte hämta från grupp och ange referensspecifikationer"
#: builtin/fetch.c:2092 #: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only" msgid "must supply remote when using --negotiate-only"
msgstr "måste ange fjärr när --negotiate-only anges" msgstr "måste ange fjärr när --negotiate-only anges"
#: builtin/fetch.c:2097 #: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting" msgid "protocol does not support --negotiate-only, exiting"
msgstr "protokollet stöder inte --negotiate-only, avslutar" msgstr "protokollet stöder inte --negotiate-only, avslutar"
#: builtin/fetch.c:2116 #: builtin/fetch.c:2121
msgid "" msgid ""
"--filter can only be used with the remote configured in extensions." "--filter can only be used with the remote configured in extensions."
"partialclone" "partialclone"
@ -15437,11 +15432,11 @@ msgstr ""
"--filter kan endast användas med fjärren konfigurerad i extensions." "--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone" "partialclone"
#: builtin/fetch.c:2120 #: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote" msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic kan bara användas vid hämtning från en fjärr" msgstr "--atomic kan bara användas vid hämtning från en fjärr"
#: builtin/fetch.c:2124 #: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote" msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin kan bara användas vid hämtning fårn en fjärr" msgstr "--stdin kan bara användas vid hämtning fårn en fjärr"

182
po/tr.po
View File

@ -90,7 +90,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git Turkish Localization Project\n" "Project-Id-Version: Git Turkish Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2022-01-11 09:38+0800\n" "POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2022-01-11 18:00+0300\n" "PO-Revision-Date: 2022-01-11 18:00+0300\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "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'"
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 #: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 #: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 #: 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"
msgid "" msgid ""
"cannot inherit upstream tracking configuration of multiple refs when " "cannot inherit upstream tracking configuration of multiple refs when "
"rebasing is requested" "rebasing is requested"
msgstr "yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak " msgstr ""
"izleme yapılandırması miras alınamıyor" "yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak izleme "
"yapılandırması miras alınamıyor"
#: branch.c:88 #: branch.c:88
#, c-format #, c-format
@ -2007,13 +2008,15 @@ msgstr ""
#: branch.c:203 #: branch.c:203
#, c-format #, c-format
msgid "asked to inherit tracking from '%s', but no remote is set" msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr "'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış" msgstr ""
"'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
#: branch.c:209 #: branch.c:209
#, c-format #, c-format
msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr "'%s' konumundan izleme miras istendi; ancak bir birleştirme " msgstr ""
"yapılandırması ayarlanmamış" "'%s' konumundan izleme miras istendi; ancak bir birleştirme yapılandırması "
"ayarlanmamış"
#: branch.c:252 #: branch.c:252
#, c-format #, c-format
@ -2032,7 +2035,7 @@ msgstr "'%s' adında bir dal halihazırda var"
#: branch.c:313 #: branch.c:313
#, c-format #, c-format
msgid "cannot force update the branch '%s'checked out at '%s'" msgid "cannot force update the branch '%s' checked out at '%s'"
msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış" msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
#: branch.c:336 #: branch.c:336
@ -3429,15 +3432,17 @@ msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
#: diff.c:4597 #: diff.c:4597
#, c-format #, c-format
msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' " msgstr ""
"ile kullanın" "'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
"kullanın"
#: diff.c:4601 #: diff.c:4601
#, c-format #, c-format
msgid "" msgid ""
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' " msgstr ""
"ve '%s' ile kullanın" "'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
"ile kullanın"
#: diff.c:4681 #: diff.c:4681
msgid "--follow requires exactly one pathspec" msgid "--follow requires exactly one pathspec"
@ -5867,7 +5872,7 @@ msgstr "%s: veritabanına ekleme başarısız"
msgid "%s: unsupported file type" msgid "%s: unsupported file type"
msgstr "%s: desteklenmeyen dosya türü" msgstr "%s: desteklenmeyen dosya türü"
#: object-file.c:2329 builtin/fetch.c:1448 #: object-file.c:2329 builtin/fetch.c:1453
#, c-format #, c-format
msgid "%s is not a valid object" msgid "%s is not a valid object"
msgstr "%s geçerli bir nesne değil" msgstr "%s geçerli bir nesne değil"
@ -7130,41 +7135,41 @@ msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
msgid "update_ref failed for ref '%s': %s" msgid "update_ref failed for ref '%s': %s"
msgstr "'%s' başvurusu için update_ref başarısız oldu: %s" msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
#: refs.c:2069 #: refs.c:2067
#, c-format #, c-format
msgid "multiple updates for ref '%s' not allowed" msgid "multiple updates for ref '%s' not allowed"
msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor" msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
#: refs.c:2152 #: refs.c:2150
msgid "ref updates forbidden inside quarantine environment" msgid "ref updates forbidden inside quarantine environment"
msgstr "başvuru güncellemeleri karantina ortamı içinde yasak" msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
#: refs.c:2163 #: refs.c:2161
msgid "ref updates aborted by hook" msgid "ref updates aborted by hook"
msgstr "başvuru güncellemeleri kanca tarafından iptal edildi" msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
#: refs.c:2271 refs.c:2301 #: refs.c:2269 refs.c:2299
#, c-format #, c-format
msgid "'%s' exists; cannot create '%s'" msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' mevcut; '%s' oluşturulamıyor" msgstr "'%s' mevcut; '%s' oluşturulamıyor"
#: refs.c:2277 refs.c:2312 #: refs.c:2275 refs.c:2310
#, c-format #, c-format
msgid "cannot process '%s' and '%s' at the same time" msgid "cannot process '%s' and '%s' at the same time"
msgstr "'%s' ve '%s' aynı anda işlenemiyor" msgstr "'%s' ve '%s' aynı anda işlenemiyor"
#: refs/files-backend.c:1268 #: refs/files-backend.c:1267
#, c-format #, c-format
msgid "could not remove reference %s" msgid "could not remove reference %s"
msgstr "%s başvurusu kaldırılamadı" msgstr "%s başvurusu kaldırılamadı"
#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559 #: refs/packed-backend.c:1559
#, c-format #, c-format
msgid "could not delete reference %s: %s" msgid "could not delete reference %s: %s"
msgstr "%s başvurusu silinemedi: %s" msgstr "%s başvurusu silinemedi: %s"
#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format #, c-format
msgid "could not delete references: %s" msgid "could not delete references: %s"
msgstr "başvurular silinemedi: %s" msgstr "başvurular silinemedi: %s"
@ -8193,7 +8198,8 @@ msgstr "HEAD çözülemiyor"
msgid "cannot abort from a branch yet to be born" msgid "cannot abort from a branch yet to be born"
msgstr "daha doğmamış bir daldan iptal edilemiyor" msgstr "daha doğmamış bir daldan iptal edilemiyor"
#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
#: builtin/grep.c:772
#, c-format #, c-format
msgid "cannot open '%s'" msgid "cannot open '%s'"
msgstr "'%s' açılamıyor" msgstr "'%s' açılamıyor"
@ -9143,7 +9149,7 @@ msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor"
msgid "invalid remote service path" msgid "invalid remote service path"
msgstr "geçersiz uzak konum servis yolu" msgstr "geçersiz uzak konum servis yolu"
#: transport-helper.c:661 transport.c:1474 #: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol" msgid "operation not supported by protocol"
msgstr "işlem protokol tarafından desteklenmiyor" msgstr "işlem protokol tarafından desteklenmiyor"
@ -10667,7 +10673,8 @@ msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın
#: builtin/am.c:1159 #: builtin/am.c:1159
#, c-format #, c-format
msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
msgstr "Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" " msgstr ""
"Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" "
"çalıştırın." "çalıştırın."
#: builtin/am.c:1161 #: builtin/am.c:1161
@ -13347,7 +13354,7 @@ msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz"
msgid "repository '%s' does not exist" msgid "repository '%s' does not exist"
msgstr "'%s' deposu mevcut değil" msgstr "'%s' deposu mevcut değil"
#: builtin/clone.c:924 builtin/fetch.c:2047 #: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format #, c-format
msgid "depth %s is not a positive number" msgid "depth %s is not a positive number"
msgstr "%s derinliği pozitif bir sayı değil" 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."
#: builtin/commit.c:1232 #: builtin/commit.c:1232
#, c-format #, c-format
msgid "reword option of '%s' and path '%s' cannot be used together" msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr "'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz" msgstr ""
"'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz"
#: builtin/commit.c:1234 #: builtin/commit.c:1234
#, c-format #, c-format
@ -15248,70 +15256,70 @@ msgstr "getirdikten sonra işleme grafiğini yaz"
msgid "accept refspecs from stdin" msgid "accept refspecs from stdin"
msgstr "başvuru belirteçlerini stdin'den oku" msgstr "başvuru belirteçlerini stdin'den oku"
#: builtin/fetch.c:587 #: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD" msgid "couldn't find remote ref HEAD"
msgstr "uzak HEAD başvurusu bulunamadı" msgstr "uzak HEAD başvurusu bulunamadı"
#: builtin/fetch.c:761 #: builtin/fetch.c:766
#, c-format #, c-format
msgid "configuration fetch.output contains invalid value %s" msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s" msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s"
#: builtin/fetch.c:862 #: builtin/fetch.c:867
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "%s nesnesi bulunamadı" msgstr "%s nesnesi bulunamadı"
#: builtin/fetch.c:866 #: builtin/fetch.c:871
msgid "[up to date]" msgid "[up to date]"
msgstr "[güncel]" msgstr "[güncel]"
#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 #: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]" msgid "[rejected]"
msgstr "[reddedildi]" msgstr "[reddedildi]"
#: builtin/fetch.c:880 #: builtin/fetch.c:885
msgid "can't fetch in current branch" msgid "can't fetch in current branch"
msgstr "geçerli dalda getirme yapılamıyor" msgstr "geçerli dalda getirme yapılamıyor"
#: builtin/fetch.c:881 #: builtin/fetch.c:886
msgid "checked out in another worktree" msgid "checked out in another worktree"
msgstr "başka bir çalışma ağacında çıkış yapıldı" msgstr "başka bir çalışma ağacında çıkış yapıldı"
#: builtin/fetch.c:891 #: builtin/fetch.c:896
msgid "[tag update]" msgid "[tag update]"
msgstr "[etiket güncellemesi]" msgstr "[etiket güncellemesi]"
#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 #: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "yerel başvuru güncellenemiyor" msgstr "yerel başvuru güncellenemiyor"
#: builtin/fetch.c:896 #: builtin/fetch.c:901
msgid "would clobber existing tag" msgid "would clobber existing tag"
msgstr "var olan etiketi değiştirecektir" msgstr "var olan etiketi değiştirecektir"
#: builtin/fetch.c:918 #: builtin/fetch.c:923
msgid "[new tag]" msgid "[new tag]"
msgstr "[yeni etiket]" msgstr "[yeni etiket]"
#: builtin/fetch.c:921 #: builtin/fetch.c:926
msgid "[new branch]" msgid "[new branch]"
msgstr "[yeni dal]" msgstr "[yeni dal]"
#: builtin/fetch.c:924 #: builtin/fetch.c:929
msgid "[new ref]" msgid "[new ref]"
msgstr "[yeni başvuru]" msgstr "[yeni başvuru]"
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "forced update" msgid "forced update"
msgstr "zorlanmış güncelleme" msgstr "zorlanmış güncelleme"
#: builtin/fetch.c:968 #: builtin/fetch.c:973
msgid "non-fast-forward" msgid "non-fast-forward"
msgstr "ileri sarım değil" msgstr "ileri sarım değil"
#: builtin/fetch.c:1071 #: builtin/fetch.c:1076
msgid "" msgid ""
"fetch normally indicates which branches had a forced update,\n" "fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@ -15321,7 +15329,7 @@ msgstr ""
"ancak bu denetleme kapatılmış. Yeniden açmak için '--show-forced-updates'\n" "ancak bu denetleme kapatılmış. Yeniden açmak için '--show-forced-updates'\n"
"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın." "bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın."
#: builtin/fetch.c:1075 #: builtin/fetch.c:1080
#, c-format #, c-format
msgid "" msgid ""
"it took %.2f seconds to check forced updates; you can use\n" "it took %.2f seconds to check forced updates; you can use\n"
@ -15329,26 +15337,27 @@ msgid ""
"false'\n" "false'\n"
"to avoid this check\n" "to avoid this check\n"
msgstr "" msgstr ""
"Zorla güncellemeleri denetleme %.2f saniye sürdü. '--no-show-forced-updates'\n" "Zorla güncellemeleri denetleme %.2f saniye sürdü. '--no-show-forced-"
"updates'\n"
"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n" "kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
"bu denetlemeden kaçınabilirsiniz.\n" "bu denetlemeden kaçınabilirsiniz.\n"
#: builtin/fetch.c:1107 #: builtin/fetch.c:1112
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "%s tüm gerekli nesneleri göndermedi\n" msgstr "%s tüm gerekli nesneleri göndermedi\n"
#: builtin/fetch.c:1136 #: builtin/fetch.c:1141
#, c-format #, c-format
msgid "rejected %s because shallow roots are not allowed to be updated" msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor" msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
#: builtin/fetch.c:1226 builtin/fetch.c:1374 #: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "Şu konumdan: %.*s\n" msgstr "Şu konumdan: %.*s\n"
#: builtin/fetch.c:1247 #: builtin/fetch.c:1252
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
@ -15357,49 +15366,49 @@ msgstr ""
"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n" "bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
"kullanarak eski ve çakışan dalları kaldırmayı deneyin" "kullanarak eski ve çakışan dalları kaldırmayı deneyin"
#: builtin/fetch.c:1344 #: builtin/fetch.c:1349
#, c-format #, c-format
msgid " (%s will become dangling)" msgid " (%s will become dangling)"
msgstr " (%s sarkacak)" msgstr " (%s sarkacak)"
#: builtin/fetch.c:1345 #: builtin/fetch.c:1350
#, c-format #, c-format
msgid " (%s has become dangling)" msgid " (%s has become dangling)"
msgstr " (%s sarkmaya başladı)" msgstr " (%s sarkmaya başladı)"
#: builtin/fetch.c:1377 #: builtin/fetch.c:1382
msgid "[deleted]" msgid "[deleted]"
msgstr "[silindi]" msgstr "[silindi]"
#: builtin/fetch.c:1378 builtin/remote.c:1128 #: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)" msgid "(none)"
msgstr "(hiçbiri)" msgstr "(hiçbiri)"
#: builtin/fetch.c:1400 #: builtin/fetch.c:1405
#, c-format #, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'" msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı" msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı"
#: builtin/fetch.c:1420 #: builtin/fetch.c:1425
#, c-format #, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s" msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil" msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil"
#: builtin/fetch.c:1423 #: builtin/fetch.c:1428
#, c-format #, c-format
msgid "option \"%s\" is ignored for %s\n" msgid "option \"%s\" is ignored for %s\n"
msgstr "\"%s\" seçeneği %s için yok sayılıyor\n" msgstr "\"%s\" seçeneği %s için yok sayılıyor\n"
#: builtin/fetch.c:1450 #: builtin/fetch.c:1455
#, c-format #, c-format
msgid "the object %s does not exist" msgid "the object %s does not exist"
msgstr "%s diye bir nesne yok" msgstr "%s diye bir nesne yok"
#: builtin/fetch.c:1638 #: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream" msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz" msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
#: builtin/fetch.c:1650 #: builtin/fetch.c:1655
#, c-format #, c-format
msgid "" msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to " "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@ -15408,19 +15417,19 @@ msgstr ""
"HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi " "HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi "
"bir dala işaret etmiyor." "bir dala işaret etmiyor."
#: builtin/fetch.c:1663 #: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch" msgid "not setting upstream for a remote remote-tracking branch"
msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor" msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor"
#: builtin/fetch.c:1665 #: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag" msgid "not setting upstream for a remote tag"
msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor" msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
#: builtin/fetch.c:1667 #: builtin/fetch.c:1672
msgid "unknown branch type" msgid "unknown branch type"
msgstr "bilinmeyen dal türü" msgstr "bilinmeyen dal türü"
#: builtin/fetch.c:1669 #: builtin/fetch.c:1674
msgid "" msgid ""
"no source branch found;\n" "no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option" "you need to specify exactly one branch with the --set-upstream option"
@ -15428,22 +15437,22 @@ msgstr ""
"Kaynak dal bulunamadı.\n" "Kaynak dal bulunamadı.\n"
"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor." "--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
#: builtin/fetch.c:1799 builtin/fetch.c:1862 #: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "%s getiriliyor\n" msgstr "%s getiriliyor\n"
#: builtin/fetch.c:1809 builtin/fetch.c:1864 #: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format #, c-format
msgid "could not fetch %s" msgid "could not fetch %s"
msgstr "%s getirilemedi" msgstr "%s getirilemedi"
#: builtin/fetch.c:1821 #: builtin/fetch.c:1826
#, c-format #, c-format
msgid "could not fetch '%s' (exit code: %d)\n" msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "'%s' getirilemedi (çıkış kodu: %d)\n" msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
#: builtin/fetch.c:1925 #: builtin/fetch.c:1930
msgid "" msgid ""
"no remote repository specified; please specify either a URL or a\n" "no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched" "remote name from which new revisions should be fetched"
@ -15451,50 +15460,50 @@ msgstr ""
"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n" "Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
"getirileceği bir URL veya uzak konum adı belirtin." "getirileceği bir URL veya uzak konum adı belirtin."
#: builtin/fetch.c:1961 #: builtin/fetch.c:1966
msgid "you need to specify a tag name" msgid "you need to specify a tag name"
msgstr "bir etiket adı belirtmeniz gerekiyor" msgstr "bir etiket adı belirtmeniz gerekiyor"
#: builtin/fetch.c:2027 #: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*" msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "" msgstr ""
"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var" "--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
#: builtin/fetch.c:2031 #: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported" msgid "negative depth in --deepen is not supported"
msgstr "--deepen içinde negatif derinlik desteklenmiyor" msgstr "--deepen içinde negatif derinlik desteklenmiyor"
#: builtin/fetch.c:2040 #: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense" msgid "--unshallow on a complete repository does not make sense"
msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor" msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
#: builtin/fetch.c:2057 #: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "fetch --all bir depo argümanı almıyor" msgstr "fetch --all bir depo argümanı almıyor"
#: builtin/fetch.c:2059 #: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor" msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor"
#: builtin/fetch.c:2068 #: builtin/fetch.c:2073
#, c-format #, c-format
msgid "no such remote or remote group: %s" msgid "no such remote or remote group: %s"
msgstr "böyle bir uzak konum veya uzak konum grubu yok: %s" msgstr "böyle bir uzak konum veya uzak konum grubu yok: %s"
#: builtin/fetch.c:2076 #: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense" msgid "fetching a group and specifying refspecs does not make sense"
msgstr "" msgstr ""
"bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor" "bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
#: builtin/fetch.c:2092 #: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only" msgid "must supply remote when using --negotiate-only"
msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır" msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
#: builtin/fetch.c:2097 #: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting" msgid "protocol does not support --negotiate-only, exiting"
msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor" msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor"
#: builtin/fetch.c:2116 #: builtin/fetch.c:2121
msgid "" msgid ""
"--filter can only be used with the remote configured in extensions." "--filter can only be used with the remote configured in extensions."
"partialclone" "partialclone"
@ -15502,11 +15511,11 @@ msgstr ""
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum " "--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
"ile kullanılabilir." "ile kullanılabilir."
#: builtin/fetch.c:2120 #: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote" msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir" msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
#: builtin/fetch.c:2124 #: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote" msgid "--stdin can only be used when fetching from one remote"
msgstr "" msgstr ""
"--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir" "--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]"
#: builtin/sparse-checkout.c:785 #: builtin/sparse-checkout.c:785
msgid "must be in a sparse-checkout to reapply sparsity patterns" msgid "must be in a sparse-checkout to reapply sparsity patterns"
msgstr "aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış " msgstr ""
"içinde olmalı" "aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış içinde "
"olmalı"
#: builtin/sparse-checkout.c:803 #: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable" msgid "git sparse-checkout disable"
@ -22695,8 +22705,7 @@ msgid ""
"." "."
msgstr "" msgstr ""
"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken " "run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
"sıfır olmayan durum döndürdü" "sıfır olmayan durum döndürdü."
"."
#: builtin/submodule--helper.c:561 #: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command" msgid "suppress output of entering each submodule command"
@ -24653,7 +24662,8 @@ msgstr "uzak konum HEAD'i bir dal değil: '%.*s'"
#: contrib/scalar/scalar.c:317 #: contrib/scalar/scalar.c:317
msgid "failed to get default branch name from remote; using local default" msgid "failed to get default branch name from remote; using local default"
msgstr "uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor" msgstr ""
"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
#: contrib/scalar/scalar.c:330 #: contrib/scalar/scalar.c:330
msgid "failed to get default branch name" msgid "failed to get default branch name"

View File

@ -144,7 +144,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2022-01-11 09:38+0800\n" "POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2022-01-11 18:18+0000\n" "PO-Revision-Date: 2022-01-11 18:18+0000\n"
"Last-Translator: Fangyi Zhou <me@fangyi.io>\n" "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
@ -1011,8 +1011,8 @@ msgstr "未能识别的空白字符忽略选项 '%s'"
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 #: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 #: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 #: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
@ -2051,7 +2051,7 @@ msgstr "一个名为 '%s' 的分支已经存在"
#: branch.c:313 #: branch.c:313
#, c-format #, c-format
msgid "cannot force update the branch '%s'checked out at '%s'" msgid "cannot force update the branch '%s' checked out at '%s'"
msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'" msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
#: branch.c:336 #: branch.c:336
@ -5788,7 +5788,7 @@ msgstr "%s无法插入数据库"
msgid "%s: unsupported file type" msgid "%s: unsupported file type"
msgstr "%s不支持的文件类型" msgstr "%s不支持的文件类型"
#: object-file.c:2329 builtin/fetch.c:1448 #: object-file.c:2329 builtin/fetch.c:1453
#, c-format #, c-format
msgid "%s is not a valid object" msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象" msgstr "%s 不是一个有效的对象"
@ -7037,41 +7037,41 @@ msgstr "拒绝更新有错误名称 '%s' 的引用"
msgid "update_ref failed for ref '%s': %s" msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败:%s" msgstr "对引用 '%s' 执行 update_ref 失败:%s"
#: refs.c:2069 #: refs.c:2067
#, c-format #, c-format
msgid "multiple updates for ref '%s' not allowed" msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新" msgstr "不允许对引用 '%s' 多次更新"
#: refs.c:2152 #: refs.c:2150
msgid "ref updates forbidden inside quarantine environment" msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用" msgstr "在隔离环境中禁止更新引用"
#: refs.c:2163 #: refs.c:2161
msgid "ref updates aborted by hook" msgid "ref updates aborted by hook"
msgstr "引用更新被钩子中止" msgstr "引用更新被钩子中止"
#: refs.c:2271 refs.c:2301 #: refs.c:2269 refs.c:2299
#, c-format #, c-format
msgid "'%s' exists; cannot create '%s'" msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在,无法创建 '%s'" msgstr "'%s' 已存在,无法创建 '%s'"
#: refs.c:2277 refs.c:2312 #: refs.c:2275 refs.c:2310
#, c-format #, c-format
msgid "cannot process '%s' and '%s' at the same time" msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'" msgstr "无法同时处理 '%s' 和 '%s'"
#: refs/files-backend.c:1268 #: refs/files-backend.c:1267
#, c-format #, c-format
msgid "could not remove reference %s" msgid "could not remove reference %s"
msgstr "无法删除引用 %s" msgstr "无法删除引用 %s"
#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559 #: refs/packed-backend.c:1559
#, c-format #, c-format
msgid "could not delete reference %s: %s" msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s%s" msgstr "无法删除引用 %s%s"
#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format #, c-format
msgid "could not delete references: %s" msgid "could not delete references: %s"
msgstr "无法删除引用:%s" msgstr "无法删除引用:%s"
@ -8087,7 +8087,8 @@ msgstr "不能解析 HEAD"
msgid "cannot abort from a branch yet to be born" msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止" msgstr "不能从尚未建立的分支终止"
#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
#: builtin/grep.c:772
#, c-format #, c-format
msgid "cannot open '%s'" msgid "cannot open '%s'"
msgstr "不能打开 '%s'" msgstr "不能打开 '%s'"
@ -9023,7 +9024,7 @@ msgstr "协议不支持设置远程服务路径"
msgid "invalid remote service path" msgid "invalid remote service path"
msgstr "无效的远程服务路径" msgstr "无效的远程服务路径"
#: transport-helper.c:661 transport.c:1474 #: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol" msgid "operation not supported by protocol"
msgstr "协议不支持该操作" msgstr "协议不支持该操作"
@ -13190,7 +13191,7 @@ msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
msgid "repository '%s' does not exist" msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在" msgstr "仓库 '%s' 不存在"
#: builtin/clone.c:924 builtin/fetch.c:2047 #: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format #, c-format
msgid "depth %s is not a positive number" msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数" msgstr "深度 %s 不是一个正数"
@ -15036,70 +15037,70 @@ msgstr "抓取后写提交图"
msgid "accept refspecs from stdin" msgid "accept refspecs from stdin"
msgstr "从标准输入获取引用规格" msgstr "从标准输入获取引用规格"
#: builtin/fetch.c:587 #: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD" msgid "couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用" msgstr "无法发现远程 HEAD 引用"
#: builtin/fetch.c:761 #: builtin/fetch.c:766
#, c-format #, c-format
msgid "configuration fetch.output contains invalid value %s" msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s" msgstr "配置变量 fetch.output 包含无效值 %s"
#: builtin/fetch.c:862 #: builtin/fetch.c:867
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "对象 %s 未发现" msgstr "对象 %s 未发现"
#: builtin/fetch.c:866 #: builtin/fetch.c:871
msgid "[up to date]" msgid "[up to date]"
msgstr "[最新]" msgstr "[最新]"
#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 #: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]" msgid "[rejected]"
msgstr "[已拒绝]" msgstr "[已拒绝]"
#: builtin/fetch.c:880 #: builtin/fetch.c:885
msgid "can't fetch in current branch" msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作" msgstr "当前分支下不能执行获取操作"
#: builtin/fetch.c:881 #: builtin/fetch.c:886
msgid "checked out in another worktree" msgid "checked out in another worktree"
msgstr "已在另一个工作树中检出" msgstr "已在另一个工作树中检出"
#: builtin/fetch.c:891 #: builtin/fetch.c:896
msgid "[tag update]" msgid "[tag update]"
msgstr "[标签更新]" msgstr "[标签更新]"
#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 #: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "不能更新本地引用" msgstr "不能更新本地引用"
#: builtin/fetch.c:896 #: builtin/fetch.c:901
msgid "would clobber existing tag" msgid "would clobber existing tag"
msgstr "会破坏现有的标签" msgstr "会破坏现有的标签"
#: builtin/fetch.c:918 #: builtin/fetch.c:923
msgid "[new tag]" msgid "[new tag]"
msgstr "[新标签]" msgstr "[新标签]"
#: builtin/fetch.c:921 #: builtin/fetch.c:926
msgid "[new branch]" msgid "[new branch]"
msgstr "[新分支]" msgstr "[新分支]"
#: builtin/fetch.c:924 #: builtin/fetch.c:929
msgid "[new ref]" msgid "[new ref]"
msgstr "[新引用]" msgstr "[新引用]"
#: builtin/fetch.c:963 #: builtin/fetch.c:968
msgid "forced update" msgid "forced update"
msgstr "强制更新" msgstr "强制更新"
#: builtin/fetch.c:968 #: builtin/fetch.c:973
msgid "non-fast-forward" msgid "non-fast-forward"
msgstr "非快进" msgstr "非快进"
#: builtin/fetch.c:1071 #: builtin/fetch.c:1076
msgid "" msgid ""
"fetch normally indicates which branches had a forced update,\n" "fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@ -15109,7 +15110,7 @@ msgstr ""
"要重新启用,请使用 '--show-forced-updates' 选项或运行\n" "要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
"'git config fetch.showForcedUpdates true'" "'git config fetch.showForcedUpdates true'"
#: builtin/fetch.c:1075 #: builtin/fetch.c:1080
#, c-format #, c-format
msgid "" msgid ""
"it took %.2f seconds to check forced updates; you can use\n" "it took %.2f seconds to check forced updates; you can use\n"
@ -15120,22 +15121,22 @@ msgstr ""
"花了 %.2f 秒来检查强制更新;您可以使用 '--no-show-forced-updates'\n" "花了 %.2f 秒来检查强制更新;您可以使用 '--no-show-forced-updates'\n"
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n" "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
#: builtin/fetch.c:1107 #: builtin/fetch.c:1112
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n" msgstr "%s 未发送所有必需的对象\n"
#: builtin/fetch.c:1136 #: builtin/fetch.c:1141
#, c-format #, c-format
msgid "rejected %s because shallow roots are not allowed to be updated" msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆的根不允许被更新" msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
#: builtin/fetch.c:1226 builtin/fetch.c:1374 #: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "来自 %.*s\n" msgstr "来自 %.*s\n"
#: builtin/fetch.c:1247 #: builtin/fetch.c:1252
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
@ -15145,69 +15146,69 @@ msgstr ""
" 'git remote prune %s' 来删除旧的、有冲突的分支" " 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者:注意保持前导空格 # 译者:注意保持前导空格
#: builtin/fetch.c:1344 #: builtin/fetch.c:1349
#, c-format #, c-format
msgid " (%s will become dangling)" msgid " (%s will become dangling)"
msgstr " %s 将成为悬空状态)" msgstr " %s 将成为悬空状态)"
# 译者:注意保持前导空格 # 译者:注意保持前导空格
#: builtin/fetch.c:1345 #: builtin/fetch.c:1350
#, c-format #, c-format
msgid " (%s has become dangling)" msgid " (%s has become dangling)"
msgstr " %s 已成为悬空状态)" msgstr " %s 已成为悬空状态)"
#: builtin/fetch.c:1377 #: builtin/fetch.c:1382
msgid "[deleted]" msgid "[deleted]"
msgstr "[已删除]" msgstr "[已删除]"
#: builtin/fetch.c:1378 builtin/remote.c:1128 #: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)" msgid "(none)"
msgstr "(无)" msgstr "(无)"
#: builtin/fetch.c:1400 #: builtin/fetch.c:1405
#, c-format #, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'" msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'" msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
#: builtin/fetch.c:1420 #: builtin/fetch.c:1425
#, c-format #, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s" msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
#: builtin/fetch.c:1423 #: builtin/fetch.c:1428
#, c-format #, c-format
msgid "option \"%s\" is ignored for %s\n" msgid "option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n" msgstr "选项 \"%s\" 为 %s 所忽略\n"
#: builtin/fetch.c:1450 #: builtin/fetch.c:1455
#, c-format #, c-format
msgid "the object %s does not exist" msgid "the object %s does not exist"
msgstr "对象 '%s' 不存在" msgstr "对象 '%s' 不存在"
#: builtin/fetch.c:1638 #: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream" msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支,和 --set-upstream 不兼容" msgstr "检测到多分支,和 --set-upstream 不兼容"
#: builtin/fetch.c:1650 #: builtin/fetch.c:1655
#, c-format #, c-format
msgid "" msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to " "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
"any branch." "any branch."
msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。" msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
#: builtin/fetch.c:1663 #: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch" msgid "not setting upstream for a remote remote-tracking branch"
msgstr "没有为一个远程跟踪分支设置上游" msgstr "没有为一个远程跟踪分支设置上游"
#: builtin/fetch.c:1665 #: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag" msgid "not setting upstream for a remote tag"
msgstr "没有为一个远程标签设置上游" msgstr "没有为一个远程标签设置上游"
#: builtin/fetch.c:1667 #: builtin/fetch.c:1672
msgid "unknown branch type" msgid "unknown branch type"
msgstr "未知的分支类型" msgstr "未知的分支类型"
#: builtin/fetch.c:1669 #: builtin/fetch.c:1674
msgid "" msgid ""
"no source branch found;\n" "no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option" "you need to specify exactly one branch with the --set-upstream option"
@ -15215,79 +15216,79 @@ msgstr ""
"未发现源分支;\n" "未发现源分支;\n"
"您需要使用 --set-upstream 选项指定一个分支" "您需要使用 --set-upstream 选项指定一个分支"
#: builtin/fetch.c:1799 builtin/fetch.c:1862 #: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "正在获取 %s\n" msgstr "正在获取 %s\n"
#: builtin/fetch.c:1809 builtin/fetch.c:1864 #: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format #, c-format
msgid "could not fetch %s" msgid "could not fetch %s"
msgstr "不能获取 %s" msgstr "不能获取 %s"
#: builtin/fetch.c:1821 #: builtin/fetch.c:1826
#, c-format #, c-format
msgid "could not fetch '%s' (exit code: %d)\n" msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "无法获取 '%s'(退出码:%d\n" msgstr "无法获取 '%s'(退出码:%d\n"
#: builtin/fetch.c:1925 #: builtin/fetch.c:1930
msgid "" msgid ""
"no remote repository specified; please specify either a URL or a\n" "no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched" "remote name from which new revisions should be fetched"
msgstr "未指定远程仓库;请指定一个用于获取新版本的 URL 或远程仓库名" msgstr "未指定远程仓库;请指定一个用于获取新版本的 URL 或远程仓库名"
#: builtin/fetch.c:1961 #: builtin/fetch.c:1966
msgid "you need to specify a tag name" msgid "you need to specify a tag name"
msgstr "您需要指定一个标签名称" msgstr "您需要指定一个标签名称"
#: builtin/fetch.c:2027 #: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*" msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*" msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
#: builtin/fetch.c:2031 #: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported" msgid "negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度" msgstr "--deepen 不支持负数深度"
#: builtin/fetch.c:2040 #: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense" msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
#: builtin/fetch.c:2057 #: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数" msgstr "fetch --all 不能带一个仓库参数"
#: builtin/fetch.c:2059 #: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义" msgstr "fetch --all 带引用规格没有任何意义"
#: builtin/fetch.c:2068 #: builtin/fetch.c:2073
#, c-format #, c-format
msgid "no such remote or remote group: %s" msgid "no such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s" msgstr "没有这样的远程或远程组:%s"
#: builtin/fetch.c:2076 #: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense" msgid "fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义" msgstr "获取组并指定引用规格没有意义"
#: builtin/fetch.c:2092 #: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only" msgid "must supply remote when using --negotiate-only"
msgstr "在使用 --negotiate-only 时必须提供远程仓库" msgstr "在使用 --negotiate-only 时必须提供远程仓库"
#: builtin/fetch.c:2097 #: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting" msgid "protocol does not support --negotiate-only, exiting"
msgstr "协议不支持 --negotiate-only退出" msgstr "协议不支持 --negotiate-only退出"
#: builtin/fetch.c:2116 #: builtin/fetch.c:2121
msgid "" msgid ""
"--filter can only be used with the remote configured in extensions." "--filter can only be used with the remote configured in extensions."
"partialclone" "partialclone"
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
#: builtin/fetch.c:2120 #: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote" msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 仅在从一个远程仓库获取的时候可用" msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
#: builtin/fetch.c:2124 #: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote" msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 仅在从一个远程仓库获取的时候可用" msgstr "--stdin 仅在从一个远程仓库获取的时候可用"