# Bulgarian translation of git po-file.
# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Alexander Shopov <ash@kambanaria.org>.
# This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
#
# ========================
# DICTIONARY TO MERGE IN GIT GUI
# switch to branch преминавам към клон
# sparse entry/blob частично изтеглена директория/път/обект-BLOB
# sparse index частичен индекс
+# sparcity частичност
# revision range диапазон на версиите
# cover letter придружаващо писмо
# reference repository еталонно хранилище
# prefetch предварително доставяне
# scheduler планиращ модул
# snapshot снимка
+# enlistment зачислена директория
+# zealous merge засилено сливане
+# unregister отчислявам
+# marked counting изброяване
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
# msgcat todo1.po todo2.po > todo.po
# grep '^#: ' todo.po | sed 's/^#: //' | tr ' ' '\n' | sed 's/:[0-9]*$//' > FILES
# for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n
+#
msgid ""
msgstr ""
"Project-Id-Version: git 2.34\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-12 19:22+0100\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
+"PO-Revision-Date: 2022-01-16 10:50+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
msgid "Huh (%s)?"
msgstr "Неуспешен анализ — „%s“."
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
msgid "could not stage '%s'"
msgstr "неуспешно добавяне в индекса на „%s“"
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "индексът не може да бъде записан"
msgid "note: %s is untracked now.\n"
msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
msgid "ignoring unmerged: %s"
msgstr "пренебрегване на неслятото: „%s“"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Само двоични файлове са променени.\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Няма промени.\n"
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Обновяване на кръпка"
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Преглед на разликата"
msgid "(empty) select nothing"
msgstr "(празно) без избор на нищо"
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Избор на следващо действие"
msgid "unstaged"
msgstr "извън индекса"
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "път"
msgstr "индексът не може да бъде обновен"
#
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Добавяне на добавянето [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? "
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Скатаване на добавянето [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Изваждане на добавянето [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на добавянето към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? "
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на добавянето от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от индекса и работното дърво [y,"
"n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n,"
"q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr "Избраните парчета не може да се добавят в индекса!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Да се приложат ли към работното дърво? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Нищо не е приложено.\n"
msgid "No other hunks to goto"
msgstr "Няма други парчета"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "към кое парче да се придвижи? "
msgid "No other hunks to search"
msgstr "Няма други парчета за търсене"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "да се търси с регулярен израз? "
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната опция за игнориране на знаците за интервали „%s“"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "опциите „--reject“ и „--3way“ са несъвместими"
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "като „--3way“, но извън хранилище"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "като „--index“, но извън хранилище"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "като „--cached“, но извън хранилище"
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "„%s“ извън хранилище"
#: apply.c:800
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "в хранилището липсват необходимите обекти-BLOB, за тройно сливане."
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Тройно сливане…\n"
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Неуспешно тройно сливане…\n"
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Преминаване към пряко прилагане…\n"
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…"
msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…"
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
-msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
+msgstr "съкращаване на името на файла с отхвърлените парчета на „%.*s.rej“"
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "непознат вход"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"На входа няма непразни кръпки (те се приемат при опция „--allow-empty“)"
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "БРОЙ"
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"пробване с тройно сливане, ако това не сработи — стандартно прилагане на "
"кръпка"
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr "действие"
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "повече подробности"
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "да не се връща грешка при празни кръпки"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "филтърът „%s“ не може да бъде стартиран"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "дескрипторът не може да бъде пренасочен"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "филтърът „%s“ върна грешка"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "cannot read %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "ПРЕФИКС"
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "ФАЙЛ"
msgstr "извеждане на списъка с поддържаните формати"
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "хранилище"
msgid "retrieve the archive from remote repository <repo>"
msgstr "получаване на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr "команда"
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "опцията „--exec“ изисква „--remote“"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "опцията „%s“ изисква „%s“"
#: archive.c:582
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "опциите „--add-file“ и „--remote“ са несъвместими"
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен"
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"\n"
-"След корекция на грешката, може да обновите\n"
-"информацията за следения клон чрез:\n"
-"git branch --set-upstream-to=%s%s%s"
+"настроените множество указатели, които да се следят, не може да се наследят "
+"при пребазиране"
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "not setting branch '%s' as its own upstream"
msgstr ""
-"Ð\9aлонÑ\8aÑ\82 â\80\9e%sâ\80\9c не може да Ñ\81лÑ\83жи каÑ\82о изÑ\82оÑ\87ник за Ñ\81обÑ\81Ñ\82венаÑ\82а Ñ\81и Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8f."
+"клонÑ\8aÑ\82 â\80\9e%sâ\80\9c не може да Ñ\81лÑ\83жи каÑ\82о изÑ\82оÑ\87ник за Ñ\81обÑ\81Ñ\82венаÑ\82а Ñ\81и Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8f"
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr ""
-"Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“ чрез "
-"пребазиране."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "клонът „%s“ ще следи „%s“ чрез пребазиране."
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Ð\9aлонÑ\8aÑ\82 â\80\9e%sâ\80\9c Ñ\89е Ñ\81леди оÑ\82далеÑ\87ениÑ\8f клон â\80\9e%sâ\80\9c оÑ\82 Ñ\85Ñ\80анилиÑ\89еÑ\82о „%s“."
+msgid "branch '%s' set up to track '%s'."
+msgstr "клонÑ\8aÑ\82 â\80\9e%sâ\80\9c Ñ\89е Ñ\81леди „%s“."
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Ð\9aлонÑ\8aÑ\82 â\80\9e%sâ\80\9c Ñ\89е Ñ\81леди локалниÑ\8f клон â\80\9e%sâ\80\9c Ñ\87Ñ\80ез пÑ\80ебазиÑ\80ане."
+msgid "branch '%s' set up to track:"
+msgstr "клонÑ\8aÑ\82 â\80\9e%sâ\80\9c Ñ\89е Ñ\81леди:"
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Клонът „%s“ ще следи локалния клон „%s“."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "настройките за следения клон не може да бъдат записани"
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Клонът „%s“ ще следи отдалечения указател „%s“ чрез пребазиране."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"След корекция на грешката, може да обновите\n"
+"информацията за следения клон чрез:"
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Клонът „%s“ ще следи отдалечения указател „%s“."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"заявка за наследяване на следенето от „%s“, но не е зададено отдалечено "
+"хранилище"
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Клонът „%s“ ще следи локалния указател „%s“ чрез пребазиране."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"заявка за наследяване на следенето от „%s“, но не е настроен режим за "
+"пребазиране"
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Ð\9aлонÑ\8aÑ\82 â\80\9e%sâ\80\9c Ñ\89е Ñ\81леди локалниÑ\8f Ñ\83казаÑ\82ел â\80\9e%sâ\80\9c."
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "нÑ\8fма Ñ\81ледене: инÑ\84оÑ\80маÑ\86иÑ\8fÑ\82а за Ñ\83казаÑ\82елÑ\8f â\80\9e%sâ\80\9c не е еднознаÑ\87на"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Настройките за следения клон не може да бъдат записани"
-
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Няма следене: информацията за указателя „%s“ не е еднозначна"
+msgid "'%s' is not a valid branch name"
+msgstr "„%s“ не е позволено име за клон"
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "„%s“ не е позволено име за клон."
+msgid "a branch named '%s' already exists"
+msgstr "вече съществува клон с име „%s“."
-#: branch.c:208
+# FIXME
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Вече съществува клон с име „%s“."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Текущият клон не може да бъде принудително обновен."
+msgid "cannot force update the branch '%s'checked out at '%s'"
+msgstr ""
+"не може принудително да обновите клона „%s“, който е изтеглен в пътя „%s“"
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"настройките за следенето не може да се зададат — началото „%s“ не е клон"
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заявеният отдалечен клон „%s“ не съществува"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"може да използвате „git push -u“, за да настроите към кой клон да се "
"изтласква."
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Ð\9dеправилно име на обект: „%s“"
+msgid "not a valid object name: '%s'"
+msgstr "неправилно име на обект: „%s“"
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Ð\98мето на обект не е еднозначно: „%s“"
+msgid "ambiguous object name: '%s'"
+msgstr "името на обект не е еднозначно: „%s“"
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ð\9dеправилно място за начало на клон: „%s“"
+msgid "not a valid branch point: '%s'"
+msgstr "неправилно място за начало на клон: „%s“"
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "пратка %d не може да се запише с алгоритъм %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "ненулев идентификатор за краен откъс %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
msgid "unable to find all commit-graph files"
msgstr "някои файлове на гра̀фа с подаванията не може да бъдат открити"
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr "подаването „%s“ не може да бъде открито"
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"графът с подаванията изисква генериране на данни за отместването, но такива "
"липсват"
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "видът на обекта „%s“ не може да бъде определен"
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr "Разширяване на достижимите подавания в гра̀фа"
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията"
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr "Събиране на свързаните подавания"
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл"
msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла"
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr "грешка при добавяне на пакетен файл „%s“"
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr "грешка при отваряне на индекса на „%s“"
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr "Откриване на още върхове в гра̀фа с подаванията"
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr "правилният брой на базовите идентификатори не може да се запише"
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "правата за споделен достъп до „%s“ не може да бъдат зададени"
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Запазване на гра̀фа с подаванията в %d пас"
msgstr[1] "Запазване на гра̀фа с подаванията в %d паса"
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr "Търсене на подаванията със сливания"
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr "Сливане на гра̀фа с подаванията"
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е "
"изключена"
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr "прекалено много подавания за записване на гра̀фа"
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
"е преди „%s“, а не трябва"
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
"трябва да е %u"
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr "Проверка на подаванията в гра̀фа"
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
"анализира"
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
"подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
"не е"
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
"другаде е"
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
"%<PRIuMAX>"
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“%s"
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Проверка на свързаността"
"Не е хранилище на git. Ползвайте опцията „--no-index“, за да сравните "
"пътища извън работно дърво"
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
"директории\n"
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Непознат параметър „%s“ за статистиката по директории'\n"
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
"zebra“ (тъмно райе), „plain“ (обикновено)"
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"„allow-indentation-change“ (позволяване на промените в празните знаци за "
"форматиране)"
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
"„color-moved-ws“: „allow-indentation-change“ е несъвместима с другите режими "
"за празни знаци"
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr ""
-"опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
-"една с друга"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“, „%s“ и „%s“ са несъвместими"
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“ и „%s“ са несъвместими"
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"опциите „-G“ и „--pickaxe-regex“ са несъвместими една с друга. Пробвайте „--"
-"pickaxe-regex“ със „-S“"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“"
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"опциите „--pickaxe-all“ и „--find-object“ са несъвместими една с друга. "
-"Пробвайте „--pickaxe-all“ с „-G“ и „-S“"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“ и „%s“"
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "опцията „--follow“ изисква точно един път"
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "неправилна стойност за „--stat“: %s"
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "„%s“ не може да се открие"
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "опцията „%s“ изисква знак, а не: „%s“"
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "неправилен аргумент за „--color-moved“: „%s“"
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
"„histogram“ (хистограмен)"
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "неправилен аргумент към „%s“"
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "неправилен регулярен израз подаден към „-I“: „%s“"
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "неправилен аргумент към „--word-diff“: „%s“"
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr "Формат на изхода за разликите"
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "създаване на кръпки"
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "БРОЙ"
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "файловете с разлики да са в суров формат"
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr "псевдоним на „-p --raw“"
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "„--stat“ във формат за четене от програма"
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "извеждане само на последния ред на „--stat“"
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "извеждане на разпределението на промените за всяка поддиректория"
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "псевдоним на „--dirstat=cumulative“"
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
"празните знаци"
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"съкратено резюме на създадените, преименуваните и файловете с промяна на "
"режима на достъп"
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "извеждане само на имената на променените файлове"
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "извеждане само на имената и статистиката за променените файлове"
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr "извеждане на статистика за промените"
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "ШИРОЧИНА"
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "статистика с такава ШИРОЧИНА за промените"
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr "БРОЙ"
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "кратко резюме в статистиката за промените"
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "извеждане на двоична разлика във вид за прилагане"
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"показване на пълните имена на обекти в редовете за индекса при вариантите "
"преди и след промяната"
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr "разлики в цвят"
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr "ВИД"
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"грешките в празните знаци да се указват в редовете за контекста, вариантите "
"преди и след разликата,"
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "ПРЕФИКС"
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "префикс вместо „a/“ за източник"
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "префикс вместо „b/“ за цел"
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "без префикс за източника и целта"
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"извеждане на контекст между последователните парчета с разлики от указания "
"БРОЙ редове"
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "ЗНАК"
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "знак вместо „+“ за нов вариант на ред"
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "знак вместо „-“ за стар вариант на ред"
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr "знак вместо „ “ за контекст"
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr "Настройки за разлики с преименуване"
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"заместване на пълните промени с последователност от изтриване и създаване"
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr "засичане на преименуванията"
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "без предварителен вариант при изтриване"
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr "засичане на копиранията"
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr "търсене на копирано и от непроменените файлове"
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr "без търсене на преименувания"
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "празни обекти като източник при преименувания"
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr ""
"продължаване на извеждането на историята — без отрязването при преименувания "
"на файл"
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "Опции към алгоритъма за разлики"
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "търсене на възможно най-малка разлика"
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "без промени в празните знаци при сравняване на редове"
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "без промени в празните знаци"
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "без промени в празните знаци в края на редовете"
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "без промени в знаците за край на ред"
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "без промени в редовете, които са изцяло от празни знаци"
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "без промени в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ"
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"евристика за преместване на границите на парчетата за улесняване на четенето"
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "разлика чрез алгоритъм за подредба като пасианс"
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "разлика по хистограмния алгоритъм"
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr "АЛГОРИТЪМ"
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "избор на АЛГОРИТЪМа за разлики"
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr "ТЕКСТ"
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "разлика чрез алгоритъма със закотвяне"
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "РЕЖИМ"
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "различен цвят за извеждане на преместените редове"
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr ""
"режим за прескачането на празните знаци при задаването на „--color-moved“"
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr "Други опции за разлики"
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
"се ползват относителни пътища"
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr "обработка на всички файлове като текстови"
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "размяна на двата входа — обръщане на разликата"
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"завършване с код за състояние 1 при наличието на разлики, а в противен "
"случай — с 0"
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "без всякакъв изход от програмата"
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr "КОГА"
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr "ФОРМАТ"
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "начин за извеждане на промените в подмодулите"
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "без включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr "НИЗ"
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"търсене на разлики, които променят броя на поява на низовете, които напасват "
"на регулярния израз"
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr "извеждане на всички промени с „-G“/„-S“"
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "управление на подредбата на файловете в изхода"
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "ПЪТ"
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "първо извеждане на промяната в указания път"
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "прескачане на изхода към указания път"
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "търсене на разлики, които променят броя на поява на указания обект"
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr "избор на файловете по вид разлика"
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr "ФАЙЛ"
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "Изход към указания файл"
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"пълното търсене на преименувания на обекти се прескача поради многото "
"файлове."
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са само точните копия на променените пътища поради многото "
"файлове."
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
"файлът определящ частичността на изтегленото хранилище може да има проблем: "
"шаблонът „%s“ се повтаря"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "изключване на пътеводното напасване"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr ""
"кешът за неследените файлове е изключен на тази система или местоположение"
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Името на директорията не може да бъде отгатнато.\n"
"Задайте директорията изрично на командния ред"
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr "файлът с индекса е повреден в хранилището „%s“"
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "Подсказка: чака се редакторът ви да затвори файла …%c"
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr "Филтриране на съдържанието"
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "неправилен път към пространства от имена „%s“"
msgid "too many args to run %s"
msgstr "прекалено много аргументи за изпълнение „%s“"
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: неправилен изход от командата „index-pack“"
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "Сървърът поддържа „%s“"
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "Сървърът не поддържа плитки клиенти"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "клонираното хранилище е плитко, затова няма да се клонира."
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "сървърът не поддържа алгоритъм „%s“"
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "Сървърът поддържа филтри"
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: очаква се пакет за край на отговора"
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "неочаквано състояние за готовност от отдалечено хранилище"
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
"настройката „gpg.ssh.allowedSignersFile“ трябва да е зададена за проверка на "
"подписите на ssh"
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"\n"
" ssh-keygen -Y find-principals/verify"
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr ""
"файлът за отхвърляне на подписи на ssh е настроен, но не може да се открие: "
"%s"
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "лош/несъвместим подпис „%s“"
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "отпечатъкът по ssh на ключа „%s“ не може да бъде получен"
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr ""
"Поне една от настройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
"трябва да е зададена"
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr ""
"командата „gpg.ssh.defaultKeyCommand“ завърши успешно, но не върна никакви "
"ключове: %s %s"
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "неуспешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr "Програмата „gpg“ не подписа данните"
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr ""
"за подписване със ssh е необходимо да зададете настройката „user.signingkey“"
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "неуспешно запазване на ключа за подписване на ssh в „%s“"
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "неуспешно запазване на буфера за подписване на ssh в „%s“"
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
"\n"
" ssh-keygen -Y"
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "неуспешно прочитане на буфера за подписване на ssh от „%s“"
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа "
"в комбинация с „-P“ само при ползването на „PCRE v2“"
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Да се изпълни „%s“ вместо това? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Да се изпълни „%s“ вместо това [y/N]? "
#: help.c:654
#, c-format
msgid "quoted CRLF detected"
msgstr "цитирани знаци CRLF"
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "неправилно действие „%s“ за „%s“"
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s. Версия "
"%s на „%s“ е оставена в дървото."
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "неуспешно събиране на информацията за сливането на „%s“, „%s“ и „%s“"
"Сливането ще презапише локалните промени на тези файлове:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "Вече е обновено."
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "неправилен размер на откъс (OID fanout) на индекса за множество пакети"
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "непозната версия на индекс за множество пакети — %d"
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"версията на контролната сума на индекса за множество пакети %u не съвпада с "
"%u"
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr "редът не може да се анализира: „%s“"
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr "неправилен ред: „%s“."
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"индексът за множество пакети се прескача, защото контролната сума не съвпада"
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr "пакетът не може да се зареди"
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr "индексът за „%s“ не може да се отвори"
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "непознат предпочитан пакет: %s"
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr ""
"не може да изберете „%s“, който не съдържа обекти, за предпочитан пакет"
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "пакетният файл за триене „%s“ не може да се открие"
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "предпочитаният пакет „%s“ е остарял"
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr "няма пакетни файлове за индексиране"
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr "многопакетната битова маска не може да бъде запазена"
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr "индексът за множество пакети не може да бъде запазен"
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран"
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "неправилна контролна сума"
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "Търсене на указаните пакетни файлове"
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr ""
"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
"множество пакетни файлове"
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
"неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "Подредба на обектите по пакетни файлове"
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "Преброяване на свързаните обекти"
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "Търсене и изтриване на несвързаните пакетни файлове"
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "командата „pack-objects“ не може да бъде стартирана"
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "командата „pack-objects“ не може да бъде завършена"
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
"alternates“"
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
"дълбоко влагане"
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr "файлът с алтернативите не може да бъде прочетен"
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr "неуспешно изпълнение на „mmap“%s"
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr "файлът с обектите „%s“ е празен"
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr "непакетираният обект „%s“ е повреден"
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "грешни данни в края на непакетирания обект „%s“"
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr "неправилен вид обект"
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта"
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr "файлът „%s“ не може да бъде записан"
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr "правата за достъп до „%s“ не може да бъдат зададени"
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr "грешка при запис на файл"
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr "грешка при затварянето на файла с непакетиран обект"
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr "не може да бъде създаден временен файл"
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr "грешка при записа на файла с непакетиран обект"
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr "обектът за „%s“ не може да се прочете"
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr "повредено подаване"
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr "повреден етикет"
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr "грешка при четене по време на индексиране на „%s“"
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr "непълно прочитане по време на индексиране на „%s“"
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr "„%s“ не може да се вмъкне в базата от данни"
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“"
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект"
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект от вид „%s“"
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
msgid "hash mismatch %s"
msgstr "разлика в контролната сума: „%s“"
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr "задължителният обратен индекс липсва в многопакетната битова маска"
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr ""
"load_reverse_index: пакетът не може да се отвори (при зареждане на обратния "
"индекс)"
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "размерът на „%s“ не може да бъде получен"
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr "„%s“ липсва в пакет „%s“ при отместване %<PRIuMAX>"
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "използваното място за „%s“ не може да бъде получено"
msgid "could not write '%s' promisor file"
msgstr "гарантиращият файл „%s“ не може да се запише"
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "не може да се изпълни „mmap“ върху пакетния файл „%s“%s"
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
"да е отрязан)"
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "неправилна дата на срок: „%s“"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
"опцията „%s“ изисква някоя от стойностите: „always“ (винаги), "
"„auto“ (автоматично) или „never“ (никога)"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "опцията „%s“ изисква някоя от стойностите: „%s“ или „%s“"
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)"
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "псевдоним на „--%s“"
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "непозната опция: „%s“"
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "непознат флаг „%c“"
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "непозната стойност извън „ascii“ в низа: „%s“"
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr "…"
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " или: %s"
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr "%*s%s"
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-ЧИСЛО"
msgid "the remote end hung up unexpectedly"
msgstr "отдалеченото хранилище неочаквано прекъсна връзката"
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "протоколна грешка: неправилна дължина на ред: %d"
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "отдалечена грешка: %s"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%s“ не може да бъде анализирано"
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "опциите „--left-only“ и „--right-only“ са несъвместими"
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "журналът с подаванията на „%s“ не може да бъде анализиран"
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
"няма да бъде добавен псевдоним за файл „%s“ („%s“ вече съществува в индекса)"
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr "в базата от данни за обектите не може да се създаде празен обект-BLOB"
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: може да добавяте само обикновени файлове, символни връзки и директории "
"на git"
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "не е изтеглено подаване в „%s“"
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr "файлът „%s“ не може да бъде индексиран"
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr "„%s“ не може да се добави в индекса"
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr "„stat“ не може да се изпълни върху „%s“"
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "„%s“ съществува и като файл, и като директория"
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr "Обновяване на индекса"
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr "неправилен подпис: „0x%08x“"
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr "неправилна версия на индекса %d"
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr "игнориране на разширението „%.4s“"
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "непознат формат на запис в индекса: „0x%08x“"
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "неправилно име на поле в индекса близо до пътя „%s“"
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr "неподредени записи в индекса"
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "множество записи за слетия файл „%s“"
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "неподредени записи за „%s“"
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на обектите от кеша "
"(load_cache_entries): %s"
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
"не може да се изчака нишка за зареждане на обектите от кеша "
"(load_cache_entries): %s"
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr "%s: неуспешно отваряне на файла на индекса"
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: файлът на индекса е по-малък от очакваното"
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: неуспешно изпълнение на „mmap“ върху индексния файл%s"
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на разширенията на индекса "
"(load_index_extensions): %s"
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на разширенията на индекса "
"(load_index_extensions): %s"
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "споделеният индекс „%s“ не може да се обнови"
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr "индексът не може да бъде превърнат в частичен"
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr "не може да се отвори директорията на git: %s"
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr "неуспешно изтриване на „%s“"
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "правата за достъп до „%s“ не може да бъдат поправени"
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: не може да се премине към етап №0"
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr "%s: „merges“ заменя „preserve“"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr "изтрит"
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) не приема аргументи"
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "непознат аргумент за %%(objectsize): %s"
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "непознат аргумент за %%(subject): %s"
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "непознат аргумент за %%(contents): %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "непознат аргумент за „%%(raw)“: %s"
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "очаква се положителна стойност за „%s“ в %%(%s)"
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "непознат аргумент „%s“ в %%(%s)"
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "непознат аргумент за %%(align): %s"
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "непознат аргумент за „%%(if)“: %s"
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "формат: лексемата %%(%s) е използвана без съответната ѝ %%(%s)"
#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr "опцията „%s“ не сочи към подаване"
msgid "invalid branch name: %s = %s"
msgstr "неправилно име на клон: „%s = %s“"
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr "игнориране на указател на обект извън клон „%s“"
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr "журналът с подаванията за указателя „%s“ е празен"
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "указател не може да се обнови с грешно име „%s“"
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "не са позволени повече от една промени на указателя „%s“"
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина"
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr "обновяванията на указатели са преустановени от кука"
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s“ съществува, не може да се създаде „%s“"
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит"
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s"
msgid "invalid refspec '%s'"
msgstr "неправилен указател: „%s“"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"съкращението за отдалечено хранилище не може за започва със знака „/“: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "ключ „%s“ на шаблона не съдържа „*“"
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "стойност „%s“ на шаблона не съдържа „*“"
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n"
"указателя."
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"като\n"
"изтласкате към „%s:refs/heads/%s“?"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "не е открит клон съответстващ на „%s“"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
"източник"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "отдалеченият указател „%s“ не може да бъде открит"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "• прескачане на неочаквания локален указател „%s“"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Клонът е обновен към „%s“.\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (за повече информация ползвайте „%s“)\n"
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
msgid "there were errors while writing '%s' (%s)"
msgstr "грешки при записването на „%s“ (%s)"
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "грешка при изчистването на буферите при записването на „%s“"
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
msgid "could not determine HEAD revision"
msgstr "не може да се определи към какво да сочи указателят „HEAD“"
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "дървото, сочено от „%s“, не може да бъде открито"
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "опциите „--unsorted-input“ и „--no-walk“ са несъвместими"
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа"
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "опциите „--no-walk“ и „--unsorted-input“ са несъвместими"
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
"p“ и „-s“"
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "не може да се създаде асинхронна нишка: %s"
msgid "could not delete '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "„%s“ не може да бъде изтрит"
"\n"
" git revert --abort"
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr "%s: превъртане"
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
msgid "unable to dequote value of '%s'"
msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr "неправилна самоличност за автор: „%s“"
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr "повредена информация за автор: липсва дата"
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "„%s“ не може да се обнови"
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr "Съобщението при подаване №1 ще бъде прескочено:"
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщението при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr "неуспешно извличане на съобщението за подаване на „%s“"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "прескачане на %s %s — кръпката вече е приложена\n"
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr "от „%s“ не може да се чете."
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr "преустановяване на извършваното в момента отбиране на подавания"
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr "преустановяване на извършваното в момента отмяна на подаване"
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr "в момента вече се извършва отмяна на подавания"
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr "в момента вече се извършва отбиране на подавания"
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
"директорията за определянето на последователността „%s“ не може да бъде "
"създадена"
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr "в момента не тече пребазиране"
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr "в момента не се извършва отбиране на подавания"
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr "неуспешно прескачане на подаването"
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr "няма какво да се прескочи"
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"\n"
" git %s --continue"
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr "В момента се изпълнява: %s\n"
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr "запазване на подаването, в което другите да се вкарат"
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Неочакван резултат при скатаване: „%s“"
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Директорията за „%s“ не може да бъде създадена"
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr "Автоматично скатано: „%s“\n"
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr "неуспешно изпълнение на „git reset --hard“"
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
"поискате.\n"
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr "Конфликти при прилагането на автоматично скатаното."
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Пребазиране (%d/%d)%s"
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Успешно пребазиране и обновяване на „%s“.\n"
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr "промените в индекса не може да бъдат подадени."
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr "прескачане на вече приложеното подаване „%s“"
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr ""
"може да включите пропуснатите подавания с опцията „--reapply-cherry-picks“"
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr "скриптът вече е преподреден."
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "„%s“ е извън хранилището при „%s“"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"\n"
" git КОМАНДА -- ПЪТ…"
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
"не може да се зададе текуща работна директория при неправилни настройки"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "тази команда трябва да се изпълни в работно дърво"
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "открито е непознато разширение в хранилището:"
msgstr[1] "открити са непознати разширения в хранилището:"
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "версията на хранилището е 0, но е открито разширение за версия 1:"
msgstr[1] "версията на хранилището е 0, но са открити разширения за версия 1:"
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr "„%s“ не може да се отвори"
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "прекалено голям файл „.git“: „%s“"
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr "грешка при прочитане на „%s“"
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr "неправилен формат на gitfile: %s"
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr "липсва път в gitfile: „%s“"
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr "не е хранилище на Git: %s"
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr "„%s“ е прекалено голям"
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr "не е хранилище на git: „%s“"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr "процесът не може да се върне към предишната работна директория"
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr "Текущата работна директория не може да бъде прочетена"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr "неуспешно създаване на процес чрез „fork“"
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr "неуспешно изпълнение на „setsid“"
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "обектът в индекса е директория, но не частично изтеглена (%08x)"
msgstr[0] "%u байт/сек."
msgstr[1] "%u байта/сек."
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr "„%s“ не може да се редактира"
msgid "process for submodule '%s' failed"
msgstr "процесът за подмодула „%s“ завърши неуспешно"
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
msgid "invalid remote service path"
msgstr "неправилен път на отдалечената услуга"
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr "опцията не се поддържа от протокола"
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr "неуспешно изтласкване на всички необходими подмодули"
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да преминете към нов клон."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да слеете."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да извършите „%s“."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Текущата работна директория няма да бъде изтрита:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да смените клон."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"Подмодулът не може да бъде обновен:\n"
"„%s“"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"изтегляне:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"изтегляне:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"частично изтегляне:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Преустановяване на действието\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"\n"
" git sparse-checkout reapply\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Обновяване на файлове"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"във файлови системи, които не различават главни от малки букви)\n"
"и само един от участниците в конфликта е в работното дърво:\n"
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr "Обновяване на флаговете на индекса"
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"работното дърво и неследеното подаване съдържат повтарящи се обекти: %s"
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
msgid "Fetching objects"
msgstr "Доставяне на обектите"
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "„%s“ не съществува."
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s“ не е файл на .git, код за грешка: %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s“ не сочи към обратно към „%s“"
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "не е директория"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr "„.git“ не е файл"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr "„.git“ е повреден"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr "„.git“ е неправилен"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "неправилен път"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "не може да се открие хранилище: „.git“ не е файл"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "не може да се открие хранилище: файлът „.git“ не сочи към хранилище"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "не може да се открие хранилище: „.git“ е повреден"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "директорията „gitdir“ не може да се прочете"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "неправилна директория „gitdir“"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "не е валидна директория"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "файлът „gitdir“ не съществува"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
"изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
"получени: %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "неправилен файл „gitdir“"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "файлът „gitdir“ сочи несъществуващо местоположение"
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Има %d скатаване."
msgstr[1] "Има %d скатавания."
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (използвайте „git am --allow-empty“, за да включите кръпката като празно "
+"подаване)"
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "„git-rebase-todo“ липсва."
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Последно изпълнена команда (изпълнена е общо %d команда):"
msgstr[1] "Последно изпълнени команди (изпълнени са общо %d команди):"
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " (повече информация има във файла „%s“)"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Следваща команда за изпълнение (остава още %d команда):"
msgstr[1] "Следващи команди за изпълнение (остават още %d команди):"
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "В момента се извършва отбиране на подавания."
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "В момента тече отмяна на подаване."
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git revert --continue“)"
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (използвайте „git revert --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "Вие сте в частично изтегляне."
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Намирате се в частично изтеглено хранилище с %d%% налични, следени файла."
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr "Указателят „HEAD“ не е свързан и е при "
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"към индекса за подаване не са добавени промени (използвайте „git add“ и/или "
"„git commit -a“)\n"
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "различен"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "назад с "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "командата за комуникация между процеси не може да бъде пратена"
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "отговорът за комуникацията между процеси не може да бъде прочетен"
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "неуспешно изпълнение на „accept_thread“ върху нишката „%s“"
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "не може да се стартира нишката worker[0] за „%s“"
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "неуспешно редактиране на кръпка"
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "пробно изпълнение"
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "повече подробности"
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "редактиране на текущата разлика и прилагане"
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "добавяне и на иначе игнорираните файлове"
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "обновяване на следените файлове"
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "добавяне на всички промени в следените и неследените файлове"
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
"no-all“)"
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "без добавяне на нови файлове, само обновяване на индекса"
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr "прескачане на файловете, които не може да бъдат добавени поради грешки"
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr ""
"обновяване и на записите извън пътеводния сегмент на частичното изтегляне"
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "предупреждаване при добавяне на вградено хранилище"
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "реализация на „git stash -p“"
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"За повече информация погледнете „git help submodule“."
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавяне на вградено хранилище: %s"
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\n"
" git config advice.addIgnoredFile false"
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-"опцията „--dry-run“ е несъвместима с всяка от опциите „--interactive“/„--"
-"patch“"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--"
-"interactive“/„--patch“"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "опциите „--pathspec-from-file“ и „--edit“ са несъвместими"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "опциите „-A“ и „-u“ са несъвместими"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "опцията „--ignore-missing“ изисква „--dry-run“"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "опцията „%s“ и път са несъвместими"
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Нищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\n"
" git config advice.addEmptyPathspec false"
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Неправилна стойност за „--empty“: „%s“"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "скриптът за автор не може да се анализира"
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "неуспешно изпълнение на „fseek“"
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да се анализира"
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "неправилна стойност за време"
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "неправилно отместване на часовия пояс"
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Кръпките не може да бъдат разделени."
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "След коригирането на този проблем изпълнете „%s --continue“."
+msgstr ""
+"След коригирането на този проблем изпълнете:\n"
+"\n"
+" %s --continue“"
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“."
+msgstr ""
+"Ако предпочитате да прескочите тази кръпка, изпълнете:\n"
+"\n"
+" %s --skip"
+
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"За да включите празната кръпка като празно подаване, изпълнете:\n"
+"\n"
+" %s --allow-empty"
-#: builtin/am.c:1129
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“."
+msgstr ""
+"За да се върнете към първоначалното състояние, изпълнете:\n"
+"\n"
+" %s --abort"
-#: builtin/am.c:1224
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на "
"редовете може да се загубят."
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Кръпката е празна."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "липсва ред за авторство в подаването „%s“"
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "грешен ред с идентичност: %.*s"
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Кръпката не може да се приложи към обектите-BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не може да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Прескачане: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Създаване на празно подаване: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Кръпката е празна."
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"За да видите неуспешно приложени кръпки, използвайте:\n"
"\n"
" git am --show-current-patch=diff"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Няма промени — създаване на празно подаване."
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Неправилна стойност за „--show-current-patch“: „%s“"
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
-"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ са несъвместими"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "опциите „%s=%s“ и „%s=%s“ са несъвместими"
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)"
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "добавяне на епилог за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "прекарване през „git-mailinfo“"
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "псевдоними на „--continue“"
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката"
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“"
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "показване на прилаганата кръпка"
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "прилагане на празна кръпка като празно подаване"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "как да се обработват празните подавания"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Открита е излишна директория „%s“.\n"
"Може да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "интерактивният режим изисква кръпки на командния ред"
msgid "show work cost statistics"
msgstr "извеждане на статистика за извършените действия"
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "извеждане на напредъка"
msgid "ignore whitespace differences"
msgstr "без разлики в знаците за интервали"
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "ВЕРС"
msgstr ""
"информация само за редовете в диапазона НАЧАЛО,КРАЙ или само на :ФУНКЦИЯта"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "има само %2$lu ред във файла „%1$s“"
msgstr[1] "има само %2$lu реда във файла „%1$s“"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "Редове с авторство"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"изтриване на клона „%s“, който е слят към „%s“,\n"
" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"отказване на изтриване на клона „%s“, който не е слят към\n"
" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не може да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "форматиращият низ не може да бъде анализиран: %s"
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr "не може да копирате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr ""
"не може да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "Неуспешно копиране на клон"
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Клонът с неправилно име „%s“ е копиран"
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на контролната сума и темата. Повтарянето на опцията прибавя "
"отдалечените клони"
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "задаване на Ñ\80ежима на Ñ\81ледене (виж git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "наÑ\81Ñ\82Ñ\80ойване кой клон да Ñ\81е Ñ\81леди"
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "изчистване на информацията за клон-източник"
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "копиране на клон и принадлежащия му журнал на указателите"
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "копиране на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "извеждане на името на текущия клон"
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "опциите „--column“ и „--verbose“ са несъвместими"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "прекалено много аргументи към командата за следене"
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
"Пробвайте с: „-a|-r --list ШАБЛОН“"
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
msgstr "git checkout--worker [ОПЦИЯ…]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr "НИЗ"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…"
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Пресъздаден е %d конфликт при сливане"
msgstr[1] "Пресъздадени са %d конфликта при сливане"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "Обновен е %d път от „%s“"
msgstr[1] "Обновени са %d пътя от „%s“"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "Обновен е %d път от индекса"
msgstr[1] "Обновени са %d пътя от индекса"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "опциите „%s“ и „%s“ са несъвместими"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "не е указано нито „%s“, нито „%s“"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"индекса:\n"
"%s"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който все още не е създаден"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" checkout.defaultRemote=origin"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s“ напасва с множество (%d) отдалечени клони"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "очаква се само един указател"
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr "очаква се един указател, а сте подали %d."
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "очаква се клон, а не етикет — „%s“"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "очаква се локален, а не отдалечен клон — „%s“"
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "очаква се клон, а не „%s“"
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "очаква се клон, а не подаване — „%s“"
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"по време на сливане не може да преминете към друг клон.\n"
"Пробвайте с „git merge --quit“ или „git worktree add“."
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"клон.\n"
"Пробвайте с „git am --quit“ или „git worktree add“."
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"по време на пребазиране не може да преминете към друг клон.\n"
"Пробвайте с „git rebase --quit“ или „git worktree add“."
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"по време на отбиране на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"по време на отмяна на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git revert --quit“ или „git worktree add“."
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "преминаване към друг клон по време на двоично търсене"
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "действие при конфликт (сливане или тройна разлика)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr ""
+"действие при конфликт („merge“ — сливане или тройна разлика с „diff3“ или "
+"„zdiff3“)"
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "задаване на кой клон бива следен при създаването на новия клон"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "опциите „-%c“, „-%c“ и „--orphan“ са несъвместими една с друга"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "опциите „-p“ и „--overlay“ са несъвместими"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "опциите „-%c“, „-%c“ и „%s“ са несъвместими"
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "липсва име на клон, използвайте опцията „-%c“"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "„%s“ не може да бъде открит"
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "трябва да укажете поне един път за възстановяване"
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "използване на припокриващ режим (стандартно)"
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git switch "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "зануляване на локалните промени"
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "към кой указател към дърво да се премине"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "възстановяване на индекса"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "възстановяване на работното дърво (стандартно)"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "пренебрегване на неслетите елементи"
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "използване на припокриващ режим"
msgid "could not lstat %s\n"
msgstr "не може да се получи информация чрез „lstat“ за „%s“\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Текущата работна директория няма да бъде изтрита\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Текущата работна директория няма да бъде изтрита\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* — избиране на всички обекти\n"
" — (празно) завършване на избирането\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши "
"изчистване"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "ИМЕ"
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr "ДЪЛБОЧИНА"
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr "ВРЕМЕ"
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "ВЕРСИЯ"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "специфични за сървъра"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "опциите „%s“ и „%s %s“ са несъвместими"
#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
"split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr "директория"
msgid "Collecting commits from input"
msgstr "Получаване на подаванията от входа"
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "непозната подкоманда: %s"
msgid "duplicate parent %s ignored"
msgstr "прескачане на повтарящ се родител: „%s“"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "неправилно име на обект: „%s“"
msgid "id of a parent commit object"
msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
msgid "read commit log message from file"
msgstr "изчитане на съобщението за подаване от ФАЙЛ"
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "опциите „-a“ и „--pathspec-from-file“ са несъвместими"
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "опциите „--include“ и „--only“ изискват аргументи."
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "опциите „-m“ и „--fixup“ са несъвместими:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "опциите „--%s“ и „--%s:%s“ са несъвместими"
#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "опциите „--long“ и „-z“ са несъвместими."
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"опцията за промяна на съобщението на „--fixup“ и указването на път „%s“ са "
-"несъвместими"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "опцията за промяна на съобщението „%s“ и пътят „%s“ са несъвместими"
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"опцията за промяна на съобщението на „--fixup“ и „--patch“/„--interactive“/"
-"„--all“/„--include“/„--only“ са несъвместими"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
-msgstr "опциите „--reset-author“ и „--author“ са несъвместими."
+msgstr "опциите „--reset-author“ и „--author“ са несъвместими"
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не може да поправяте."
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не може да поправяте."
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "В момента се извършва пребазиране, не може да поправяте."
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
"несъвместими."
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "непозната опция: --fixup=%s:%s"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]подаване"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа или за промяна на подаването или съобщението"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "ЕПИЛОГ"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr "добавяне на друг ЕПИЛОГ"
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "добавяне на епилог за подпис „Signed-off-by“"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
msgstr ""
"добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "опциите „--long“ и „--abbrev=0“ са несъвместими"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "опцията „--broken“ е несъвместима с указател към подаване"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "опциите „--stdin“ и „--merge-base“ са несъвместими"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "опциите „%s“ и указателите към обекти са несъвместими"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
msgid "%s...%s: no merge base"
msgstr "„%s..%s“: липсва база за сливане"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта-BLOB: „%s“"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: много бази за сливане, ще се ползва „%s“"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
"в режима за разлики върху директории („-d“ и „--dir-diff“)."
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "и двата файла са променени: „%s“ и „%s“."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "работното дърво е изоставено."
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "в „%s“ има временни файлове."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "възможно е да ги изчистите или възстановите"
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr "неуспешно действие с изходен код: %d"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "разлика по директории"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "следване на символните връзки при разлика по директории"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr "ПРОГРАМА"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "използване на указаната ПРОГРАМА"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
"tool“"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА за разлики "
"завърши с ненулев код"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "команда за разглеждане на разлики"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "подава се към „diff“"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“"
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "опцията „--anonymize-map“ изисква аргумент"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"как да се обработват съобщенията за подаване, които са в друго кодиране"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "внасяне на маркерите от този ФАЙЛ, ако съществува"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr ""
"да се използва изкуствено име на човек при липса на създател на етикета"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "използване на маркер за завършване на потока"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "ОТ:КЪМ"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "заместване ОТ със КЪМ в анонимизирания изход"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"указване на родителите, които не са в потока на бързо изнасяне, с "
"идентификатор на обект"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "задаване на идентификатори на маркери на етикетите"
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "опцията „--anonymize-map“ изисква „--anonymize“"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Липсват маркери „от“ за подмодула „%s“"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Липсват маркери „до“ за подмодула „%s“"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Очаква се команда „mark“, а бе получена: „%s“"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Очаква се команда „to“, а бе получена: „%s“"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr "опцията за презапис на подмодул изисква формат: име:име_на_файл"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“"
msgid "Lockfile created but not reported: %s"
msgstr "Заключващият файл е създаден, но не е докладван: „%s“"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПА"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "опцията „fetch.parallel“ трябва да е неотрицателна"
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "задаване на клон за следене за издърпване/доставяне"
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr "изискване на атомарни операции за обновяване на указателите"
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "принудително презаписване на локален указател"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "без доставянето на всички етикети „--no-tags“"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"промяна на указателя, така че и той, както останалите, да бъде в „refs/"
"prefetch/“"
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
"хранилище и презаписване на променените"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "ПРИ НУЖДА"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "запазване на доставените указатели във файла „FETCH_HEAD“"
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "добавяне на това пред пътя на подмодула"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти може са достижими при започване от този"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"без доставяне на пакетни файлове, вместо това да се извеждат предшественици "
"на договорните върхове"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "изпълняване на „maintenance --auto“ след доставяне"
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "проверка за принудителни обновявания на всички клони"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "запазване на гра̀фа с подаванията след доставяне"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "четене на указателите от стандартния вход"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
+msgstr "указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
msgid "[up to date]"
msgstr "[актуален]"
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr "[отхвърлен]"
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr "изтеглен в друго работно дърво"
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"За да я включите еднократно ползвайте опцията „--show-forced-updates“, а за "
-"да я включите за постоянно, изпълнете:\n"
+"Обичайно при доставяне се извежда, кои клони са били принудително обновени,\n"
+"но тази проверка е изключена. За да я включите за командата, ползвайте "
+"опцията\n"
+"„--show-forced-updates“, а за да я включите за постоянно, изпълнете:\n"
"\n"
" git config fetch.showForcedUpdates true"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
"Проверката за принудителни изтласквания отне %.2f сек. Може да я прескочите "
"еднократно с опцията „--no-show-forced-updates“, а за да я изключите за "
"\n"
" git config fetch.showForcedUpdates false\n"
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Ð\9dе може да доÑ\81Ñ\82авиÑ\82е в Ñ\82екÑ\83Ñ\89иÑ\8f клон â\80\9e%sâ\80\9c на Ñ\85Ñ\80анилиÑ\89е, коеÑ\82о не е голо"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "не може да доÑ\81Ñ\82авиÑ\82е в клона â\80\9e%sâ\80\9c, койÑ\82о е изÑ\82еглен в пÑ\8aÑ\82Ñ\8f â\80\9e%sâ\80\9c"
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr "опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr "обектът „%s“ не съществува"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"следеното от „HEAD“ не може да се смени от „%2$s“ на „%1$s“, защото второто "
+"не сочи към никой клон."
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr "непознат вид клон"
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"не е открит клон за следене.\n"
-"Трябва изрично да зададете един клон с опцията „--set-upstream option“."
+"не е открит клон за следене;\n"
+"трябва изрично да зададете точно един клон с опцията „--set-upstream“"
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Ð\9dе Ñ\81Ñ\82е Ñ\83казали оÑ\82далеÑ\87ено Ñ\85Ñ\80анилиÑ\89е. Ð\97адайте или адрес, или име\n"
+"не Ñ\81Ñ\82е Ñ\83казали оÑ\82далеÑ\87ено Ñ\85Ñ\80анилиÑ\89е; задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Трябва да укажете име на етикет."
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
+msgstr "трябва да укажете име на етикет"
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
"Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“"
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "опциите „--deepen“ и „--depth“ са несъвместими"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
+msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия"
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Ð\9dяма нито отдалечено хранилище, нито група от хранилища на име „%s“"
+msgid "no such remote or remote group: %s"
+msgstr "няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Указването на група и указването на версия са несъвместими"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "доÑ\81Ñ\82авÑ\8fнето на група и указването на версия са несъвместими"
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr "опцията „--negotiate-only“ изисква хранилище"
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Протоколът не поддържа опцията „--negotiate-only“, изход от прогамата."
-
#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата"
+
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
"настройката „extensions.partialclone“"
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
msgid "--stdin can only be used when fetching from one remote"
msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище"
msgstr ""
"git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
"вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения "
"журнал"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "псевдоним на „--log“ (ОСТАРЯЛО)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "ТЕКСТ"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "за начало на съобщението да се ползва ТЕКСТ"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "използване на това ИМЕ вместо истинския клон-цел"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "файл, от който да се чете"
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [ПОДАВАНЕ]] [--no-contains [ПОДАВАНЕ]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "цитиране подходящо за командни интерпретатори на обвивката"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "цитиране подходящо за perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "цитиране подходящо за python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "цитиране подходящо за tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "извеждане само на указателите, сочещи към ОБЕКТА"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "извеждане само на слетите указатели"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "извеждане само на неслетите указатели"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
msgid "%s: object is of unknown type '%s': %s"
msgstr "%s: обектът е непознат вид „%s“: %s"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "„%s“: не може да се анализира: „%s“"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "неправилен ред с контролна сума по SHA1: „%s“"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Проверка на директория с обекти"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Проверка на връзките на „%s“"
#
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "неправилен указател „%s“"
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "„%s“ сочи към нещо необичайно (%s)"
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Проверка на дървото на кеша"
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "в дървото на кеша има нещо, което не е дърво"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "проследяване и на указателите от журнала с указателите (стандартно)"
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Проверка на обектите"
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "„%s“: липсващ обект"
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“"
msgid "failed to parse '%s' value '%s'"
msgstr "стойността на „%s“ — „%s“ не може да се анализира"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "препакетиране на всичко без най-големия пакет"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "неразпозната стойност на „gc.logexpiry“ %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "неразпозната стойност на периода за окастряне: %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководството за повече информация как да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Има прекалено много недостижими, непакетирани обекти.\n"
"Използвайте „git prune“, за да ги окастрите."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=ЗАДАЧА] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "опцията „--no-schedule“ не е позволена"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "непознат аргумент към „--schedule“: %s"
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "графът с подаванията не може да бъде записан"
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "неуспешно предварително доставяне на отдалечените клони"
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr "процесът за командата „git pack-objects“ не може да бъде стартиран"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr "процесът за командата „git pack-objects“ не може да завърши"
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "индексът за множество пакети не може да бъде записан"
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "неуспешно изпълнение на „git multi-pack-index expire“"
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "неуспешно изпълнение на „git multi-pack-index repack“"
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"задачата „incremental-repack“ се прескача, защото настройката „core."
"multiPackIndex“ е изключена"
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "заключващият файл „%s“ съществува. Действието се прескача"
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "неуспешно изпълнение на задачата „%s“"
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "„%s“ не е правилна задача"
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "задачата „%s“ не може да се избере повече от веднъж"
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "изпълняване на задачи според състоянието на хранилището"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "честота"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "изпълняване на задачи по график"
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "без извеждане на напредъка и друга информация на стандартния изход"
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr "задача"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "изпълнение на определена задача"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими"
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "неуспешно изпълнение на „git config“"
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "грешка при заместването на пътя „%s“"
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "неуспешно стартиране на „launchctl“."
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "услугата „%s“ не може се настрои първоначално"
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "неуспешно създаване на временен файл за xml"
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "задачите за периодично изпълнение не може да се стартират"
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"неуспешно изпълнение на „crontab -l“. Системата ви може да не поддържа "
"„cron“"
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"неуспешно изпълнение на „crontab“. Системата ви може да не поддържа „cron“"
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "стандартният вход на „crontab“ не може да се отвори"
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "процесът на „crontab“ умря"
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr "неуспешно стартиране на „systemctl“"
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr "неуспешно изпълнение на „systemctl“"
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr "непознат аргумент към „--scheduler“: %s"
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr "липсват както таймери на systemd, така и crontab"
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr "планиращият модул „%s“ липсва"
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "друг процес задава поддръжката на заден фон"
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr "git maintenance start [--scheduler=ПЛАНИРАЩ_МОДУЛ]"
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr "ПЛАНИРАЩ_МОДУЛ"
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr "ПЛАНИРАЩият_МОДУЛ, който да изпълнява задачите"
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "неуспешно добавяне на хранилище към файла с глобални настройки"
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]"
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "неправилна подкоманда: „%s“"
msgid "unrecognized help format '%s'"
msgstr "непознат формат на помощта „%s“"
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "Неуспешно стартиране на „emacsclient“."
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "Версията на „emacsclient“ не може да се анализира."
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"„%s“: команда за поддържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.path“."
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководството."
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr ""
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "неправилен низ за настройката „alias.%s“: „%s“"
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr "опцията не приема аргументи"
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "За повече информация изпълнете „git help config“"
msgid "unknown hash algorithm '%s'"
msgstr "непознат алгоритъм за контролни суми „%s“"
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "опцията „--fix-thin“ изисква „--stdin“"
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "опцията „--object-format“ и „--stdin“ са несъвместими"
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
msgid "specify the hash algorithm to use"
msgstr "указване на алгоритъм за контролна сума"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "опциите „--separate-git-dir“ и „--bare“ са несъвместими"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с път"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "обектът не може да бъде прочетен: %s"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "неизвестен вид: %d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: неправилно придружаващо писмо от режима на описание"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "трябва да зададете точно един диапазон"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "не е диапазон"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "неуспешно създаване на придружаващо писмо"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "може да укажете максимум една директория за изход"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "непознато подаване: „%s“"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "„%s“ не е указател или не сочи към нищо"
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "точната база за сливане не може да бъде открита"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Може ръчно да зададете базово подаване чрез „--"
"base=<ИДЕНТИФИКАТОР_НА_БАЗОВО_ПОДАВАНЕ>“."
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "точната база при сливане не може да бъде открита"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr ""
"неуспешно определяне на началото на диапазонната разлика на текущата поредица"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
"„%s“ се ползва като началото на диапазонната разлика на текущата поредица"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr "номер на редакция"
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "максимална дължина на име на всеки пакетен файл"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "режим-придружаващо-писмо-по-описание"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"генериране на частите на придружаващото писмо на базата на описанието на "
"клона"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "без кръпки, които присъстват в следения клон"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr "извеждане на напредъка във фазата на създаване на кръпките"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
"кръпка"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
"или единствена кръпка"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "процент за претегляне при оценка на създаването"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "опциите „-n“ и „-k“ са несъвместими"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "опциите „--subject-prefix“/„--rfc“ и „-k“ са несъвместими"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"опциите „--stdout“, „--output“ и „--output-directory“ са несъвместими една с "
-"друга"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
"опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "Разлика в разликите:"
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "Разлика в разликите спрямо v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "опцията „--creation-factor“ изисква опция „--range-diff“"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "Диапазонна разлика:"
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "Диапазонна разлика спрямо v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "Създаване на кръпки"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "неуспешно създаване на изходни файлове"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да се счетат за непроменени"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "малки букви за файловете за командата „fsmonitor clean“"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr "изчитане на шаблоните за игнориране от ФАЙЛ"
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "без повтаряне на записите"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+"указване на частично изтеглените директории при наличието на частичен индекс"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr "сливане на базата на „diff3“"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "засилено сливане на базата на „diff3“"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "при конфликти да се ползва локалната версия"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "при конфликти да се ползва чуждата версия"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "при конфликти да се ползва обединена версия"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "при конфликти да се ползва маркер с такъв БРОЙ знаци"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "без предупреждения при конфликти"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2"
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "опцията „%s“ изисква стойност"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(псевдоним на „--stat“)"
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "използване на това ИМЕ вместо истинския клон-цел"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "преустановяване (--abort) без промяна на индекса и работното дърво"
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "продължаване на текущото сливане"
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и сливане и при промяна на "
"съобщението за подаване (pre-merge-commit и commit-msg)"
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Вече е обновено (няма какво да се вкара)"
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr "непозната опция за стратегия: -X%s"
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"В съобщението при подаване добавете информация за причината за\n"
"сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Празно съобщение предотвратява подаването.\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
"съобщение преустановява подаването.\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
"резултата.\n"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "опцията „--abort“ не приема аргументи"
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "опцията „--quit“ не приема аргументи"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "опцията „--continue“ не приема аргументи"
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "опциите „--squash“ и „--no-ff“ са несъвместими."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "опциите „--squash“ и „--commit“ са несъвместими."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "Вкарване на подаване във връх без история все още не се поддържа"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без история, сливания, които не са превъртания, са невъзможни"
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr "Може да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr "етикетът на стандартния вход не сочи към правилен обект"
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
msgid "refs snapshot for selecting bitmap commits"
msgstr "снимка на указателите за избор на подавания по битова маска"
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…"
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr "извеждане само на имена на базата на указатели (а не имена на обекти)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr "използване само на етикетите за именуване на подаванията"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr "използване само на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr "игнориране на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на всички подавания, които може да бъдат достигнати от всички "
"указатели"
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr "четене от стандартния вход"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
msgid "Write/edit the notes for the following object:"
msgstr "Записване/редактиране на бележките за следния обект:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "действието „show“ не може да се изпълни за обект „%s“"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "изведената информация от действието „show“ не може да се прочете"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "действието „show“ не може да се завърши за обект „%s“"
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“"
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "обектът-бележка не може да бъде записан"
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr "прекалено много аргументи"
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
msgid "unknown -s/--strategy: %s"
msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "докладване на окастрените обекти"
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими"
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "опцията „--filter“ изисква „--stdout“"
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "информация за окастрените обекти"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "обявяване на обектите по-стари от това ВРЕМЕ за остарели"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище с важни обекти не може да се окастря"
"дали куките преди подаване и сливане и при промяна на съобщението за "
"подаване (pre-merge-commit и commit-msg) да се изпълнят"
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "КЛОН"
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"това. За да заглушите това съобщение, изпълнете някоя от следните\n"
"команди преди следващото издърпване:\n"
"\n"
-" git config pull.rebase false # сливане (стандартна стратегия)\n"
-" git config pull.rebase true # пребазиране\n"
-" git config pull.ff only # само превъртане\n"
+" git config pull.rebase false # сливане\n"
+" git config pull.rebase true # пребазиране\n"
+" git config pull.ff only # само превъртане\n"
"\n"
"За да зададете стандартната настройка за всички свои хранилища, добавете и\n"
"опцията „--global“. За да укажете стратегия при конкретно издърпване,\n"
"използвайте опциите „--rebase“, „--no-rebase“, „--ff-only“. Те са с\n"
"приоритет пред настройките.\n"
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr "Не може да превъртите към повече от един клон."
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr ""
"Трябва да укажете как да се решават разликите при разминаване на клоните."
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "хранилище"
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "опциите „--all“ и „--tags“ са несъвместими"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "Опцията „--preserve-merges“ е заменена с „--rebase-merges“."
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "опциите „--keep-base“ и „--onto“ са несъвместими"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "опциите „--keep-base“ и „--root“ са несъвместими"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "опциите „--root“ и „--fork-point“ са несъвместими"
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "опциите за „apply“ са несъвместими с опциите за сливане"
+msgid "apply options and merge options cannot be used together"
+msgstr "опциите за прилагане и сливане са несъвместими"
#: builtin/rebase.c:1476
#, c-format
msgstr "не съществува клон/подаване „%s“"
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Трябва да укажете директория."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "трябва да укажете директория"
#: builtin/reflog.c:17
msgid ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists УКАЗАТЕЛ"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "Отбелязване на достижимите обекти…"
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "„%s“ не сочи наникъде!"
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "не е указан журнал с подавания за изтриване"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "„%s“ не е журнал с подавания"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "липсва журнал с подаванията за „%s“"
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "неправилен формат на указател: %s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
msgid "Updating %s"
msgstr "Обновяване на „%s“"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "„%s“ не може да се достави"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
"командата „pack-objects“ не може да се стартира за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични "
"указатели."
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да завърши за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "грешка при отваряне на индекса за „%s“"
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "пакет „%s“ е твърде голям, за да е част от геометрична прогресия"
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "пакет „%s“ е твърде голям за свиване"
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "временният файл „%s“ не може да бъде отворен за запис"
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr "временният файл със снимка на указателите не може да се затвори"
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "откриване на геометрична прогресия с частно <N>"
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr "запазване на многопакетен индекс за създадените пакети"
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "опциите „--keep-unreachable“ и „-A“ са несъвместими"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "опциите „--geometric“ и „-A“/„-a“ са несъвместими"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "Нищо ново за пакетиране"
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "липсва задължителния файл „%s“"
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "неуспешно изтриване на „%s“"
msgid "unable to open %s for reading"
msgstr "„%s“ не може да бъде отворен за четене"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "не може да се създаде процес за „mktree“"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "не може да се прочете от „mktree“"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "„mktree“ завърши с грешка"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "„mktree“ не върна име на обект"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "„fstat“ не може да се изпълни върху „%s“"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "обектът не може да бъде записан в базата от данни"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "неправилно име на обект: „%s“"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "не може да се определи видът на обекта „%s“"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "неуспешно редактиране на файла с обектите"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "новият и старият обект са един и същ: „%s“"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "„%s“ не може да се анализира като подаване"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е "
"изхвърлен, затова използвайте опцията „--edit“, а не „--graft“."
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "първоначалното подаване „%s“ е с подпис на GPG"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "Подписът ще бъде премахнат в заменящото подаване!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "заменящото подаване за „%s“ не може да бъде записано"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "присадката за „%s“ е излишна"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "новото и старото подаване са едно и също: „%s“"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"следните присадки не може да се преобразуват:\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "извеждане на списъка с указателите за замяна"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "изтриване на указателите за замяна"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "редактиране на съществуващ обект"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "смяна на родителите на подаване"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "преобразуване на файла за присадките"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "замяна на указателя, ако съществува"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "използване на този ФОРМАТ"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "опцията „--format“ изисква извеждане на списък"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "опцията „-f“ изисква запазването на заместител"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "опцията „--raw“ изисква „--edit“"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "опцията „-d“ изисква поне един аргумент"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "неправилен брой аргументи"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "опцията „-e“ изисква поне един аргумент"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "опцията „-g“ изисква поне един аргумент"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "опцията „--convert-graft-file“ не приема аргументи"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "опцията „-l“ приема точно един шаблон"
msgid "unable to generate diff for '%s'"
msgstr "неуспешно генериране на разлика за „%s“"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩА…"
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] "
"[УКАЗАТЕЛ_КЪМ_ДЪРВО]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "смесено (mixed)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "меко (soft)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "пълно (hard)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "слято (merge)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-"опцията „--patch“ е несъвместима с всяка от опциите „--hard“/„--mixed“/„--"
-"soft“"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "опцията „-N“ изисква опцията „--mixed“"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n"
"заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n"
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "филтрирането на обекти изисква опцията „--objects“"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "опцията „--objects“ е несъвместима с изброяването"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "опцията „%s“ е несъвместима с изброяването"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--"
-"independent“ и „--merge-base“"
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
msgid "no such ref %s"
msgstr "такъв указател няма: %s"
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "не може да се обработи повече от %d указател."
msgstr[1] "не може да се обработят повече от %d указатели."
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s“ е неправилен указател."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "подаването „%s“ (%s) липсва"
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "това работно дърво не е частично"
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)"
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"директорията „%s“ съдържа неследени файлове, но не е в пътищата на "
"пътеводното напасване на частичното изтегляне"
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr "директорията „%s“ не може да бъде изтрита"
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена"
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"настройката „worktreeConfig“ не може да се включи, защото форматът на "
"хранилището не може да се обнови"
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "настройките на частичния индекс не може да се променят"
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr "инициализиране на частичното изтегляне в пътеводен режим"
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr "превключване на ползването на частичен индекс"
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "настройките на частичния индекс не може да се променят"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr "„%s“ не може да се отвори"
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr "пътят „%s“ не може да се нормализира"
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | ШАБЛОН…)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчистено"
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr "шаблоните за частично изтегляне не може да се заредят"
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"съществуващите шаблони за частично изтегляне не използват пътеводни сегменти"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | ШАБЛОН…)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
msgid "read patterns from standard in"
msgstr "изчитане на шаблоните от стандартния вход"
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "няма частично изтегляне, към което да се добавя"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"ШАБЛОН…)"
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"шаблоните за частичност може да бъдат приложени наново само в частично "
+"изтеглено хранилище"
+
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr "грешка при обновяване на работната директория"
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n"
" [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
" [--] [ПЪТ…]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]"
#: builtin/stash.c:55
msgid "Index was not unstashed."
msgstr "Индексът не е изваден от скатаното."
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr "неследени файлове не може да се възстановят от скатаното"
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "опит за повторно създаване на индекса"
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "Изтрито: „%s“ (%s)"
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "Скатаното „%s“ не може да бъде изтрито"
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "„%s“ не е указател към нещо скатано"
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr "Скатаното е запазено в случай, че ви потрябва отново."
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "дървото не може да бъде анализирано"
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "дървото не може да бъде разпакетирано"
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "извеждане само на неследените файлове в скатаното"
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "съобщение при скатаване"
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Няма промени в индекса"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не може да се запазят"
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Състоянието на текущия индекс не може да бъде запазено"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"опцията „--staged“ е несъвместима както с „--include-untracked“, така и с „--"
+"all“"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "Пробвайте да използвате „git add“"
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не може да бъдат занулени"
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "запазване на индекса"
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "скатаване само на промените, вкарани в индекса"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "скатаване в режим за кръпки"
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "без извеждане на информация"
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr "директория за определянето на относителните пътища"
msgid "failed to recurse into submodule '%s'"
msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "без изход за състоянието на подмодула"
msgid "could not fetch a revision for HEAD"
msgstr "не може да се достави версия за „HEAD“"
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "опциите „--cached“ и „--files“ са несъвместими"
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n"
-"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
+"Работното дърво на подмодул „%s“ съдържа директория „.git“. Тя ще се "
+"заменени\n"
+"с файл „.git“ чрез командата „absorbgitdirs“."
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Работното дърво на подмодул „%s“ съдържа локални промени. Може да ги "
"отхвърлите с опцията „-f“"
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Директорията „%s“ е изчистена\n"
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n"
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"изтриване на работните дървета на подмодулите, дори когато те съдържат "
"локални промени"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "премахване на регистрациите на всички подмодули"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
"при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“."
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на "
"друг подмодул"
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr "директорията не е празна: „%s“"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директорията на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "предотвратяване на клониране в непразна история"
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] --url АДРЕС --path ПЪТ"
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "Неуспешно изтегляне на версия „%s“ в пътя към подмодул „%s“'"
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "Неуспешно пребазиране на версия „%s“ в пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "Неуспешно сливане на версия „%s“ в пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "Неуспешно изпълнение на командата „%s %s“ в пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "Път към подмодул „%s“: изтеглена е версия „%s“\n"
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "Път към подмодул „%s“: пребазиран към „%s“\n"
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "Път към подмодул „%s“: слят в „%s“\n"
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "Пътят на подмодула „%s“: „%s %s“\n"
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
"Неуспешно доставяне в пътя към подмодул „%s“, опит за директно доставяне на "
"„%s“"
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"Подмодулът в пътя „%s“ е доставен, но не съдържа обекта със сума\n"
"„%s“. Директното доставяне на това подаване е неуспешно."
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "извършване на плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr ""
"без извеждане на информация при обновяване чрез пребазиране или сливане"
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr "принудително изтегляне на обновленията"
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr "без доставяне на новите обекти от отдалеченото хранилище"
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr ""
"различен режим на обновяване, когато хранилището е чисто ново изтеглено"
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr "дълбочина на плиткото доставяне"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr "сума по SHA1"
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr "сумата по SHA1, очаквана от обхващащия модул"
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr "сумата по SHA1 на подмодула"
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr "сумата по SHA1 за указателя HEAD на подмодула"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr "git submodule--helper run-update-procedure [ОПЦИЯ…] [ПЪТ]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr "проверка дали писането във файла „.gitmodules“ е безопасно"
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr "изтриване на настройка във файла „.gitmodules“"
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset ИМЕ"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "без извеждане на информация при задаването на адреса на подмодул"
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]"
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "задаване на стандартния следящ клон да е „master“"
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "задаване на стандартния следящ клон"
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) ПЪТ"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) КЛОН ПЪТ"
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "необходимо е една от опциите „--branch“ и „--default“"
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "опциите „--branch“ и „--default“ са несъвместими"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Добавяне на съществуващото хранилище в „%s“ към индекса\n"
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "„%s“ съществува, а не е хранилище на Git"
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
"Открита е локална директория на Git — „%s“, която сочи към отдалечените "
"хранилища:\n"
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"правилното хранилище или ако не знаете какво означава това, използвайте\n"
"друго име като аргумент към опцията „--name“."
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Активиране на локалното хранилище за подмодула „%s“ наново.\n"
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Подмодулът „%s“ не може да бъде изтеглен"
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "Неуспешно добавяне на подмодула „%s“"
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "Неуспешно регистриране на подмодула „%s“"
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr "„%s“ вече съществува в индекса"
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "„%s“ вече съществува в индекса и не е подмодул"
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr "клон на хранилище, който да се добави като подмодул"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr "позволяване на добавяне и на иначе игнорираните файлове"
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr "извеждане само на съобщенията за грешка"
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr "заемане на обектите от еталонните хранилища"
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr "името на подмодула да е указаното, а не да е същото като пътя"
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ПЪТ]"
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Относителен път може да се ползва само от основната директория на работното "
"дърво"
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr ""
"адрес на хранилище: „%s“ трябва или да е абсолютен, или да започва с „./“ "
"или „../“"
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "„%s“ е неправилно име за подмодул"
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
" git tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "опциите „--column“ и „-n“ са несъвместими"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "опцията „-n“ изисква режим на списък."
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "опцията „--contains“ изисква режим на списък."
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "опцията „--no-contains“ изисква режим на списък."
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "опцията „--points-at“ изисква режим на списък."
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "опциите „--merged“ и „--no-merged“ изискват режим на списък."
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "опциите „-F“ и „-m“ са несъвместими."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "опцията „%s“ изисква режим на списък"
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
msgid "initializing"
msgstr "инициализация"
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Приготвяне на работното дърво (нов клон „%s“)"
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
"„%s“)"
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr "задаване на режима на следене (виж git-branch(1))"
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "опцията „--reason“ изисква „--lock“"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr "добавена с „--lock“"
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr "извеждане на подробни анотации и обяснения, ако такива са налични"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"добавяне на анотация за окастряне на работните копия по-стари от това ВРЕМЕ"
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "опциите „--verbose“ и „--porcelain“ са несъвместими"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"не може да местите или изтривате работни дървета, в които има подмодули"
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr ""
"принудително преместване, дори работното дърво да не е чисто или да е "
"заключено"
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s“ е основно работно дърво"
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "името на целта не може да се определи от „%s“"
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"не може да преместите заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"не може да преместите заключено работно дърво:\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
"проверките са неуспешни, работното дърво не може да бъде преместено: %s"
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "неуспешно изпълнение на „git status“ върху „%s“"
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"„%s“ съдържа променени или нови файлове, за принудително изтриване е "
"необходима опцията „--force“"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"принудително изтриване, дори работното дърво да не е чисто или да е заключено"
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"не може да изтриете заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"не може да изтриете заключено работно дърво:\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr "поправяне: %s: „%s“"
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr "грешка: %s: „%s“"
"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n"
"системата за помощ използвайте „git help git“."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "опцията „--git-dir“ изисква директория\n"
+msgid "no directory given for '%s' option\n"
+msgstr "опцията „%s“ изисква директория\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "опцията „--namespace“ изисква име\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "опцията „--work-tree“ изисква директория\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr "опцията „--config-env“ изисква ключ\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "опцията „-C“ изисква директория\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr "зациклен псевдоним: „%s“"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "грешка при запис на стандартния изход"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "неизвестна грешка при запис на стандартния изход"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "грешка при затваряне на стандартния изход"
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "„%s“ не може да се обработи като вградена команда"
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"употреба: %s\n"
"\n"
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
"git\n"
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "командата „%s“ не може да се изпълни: %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "опцията „--packfile“ изисква валидна контролна сума (а не „%s“)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "не е хранилище на Git"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "опцията „--packfile“ изисква опция „--index-pack-args“"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "опцията „--index-pack-args“ изисква опция „--packfile“"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "неподдържани опции"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: непозната команда „%s“ от git"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "необходима е работна директория"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "началната зачислена директория не може да бъде открита"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "не може да се премине към „%s“"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "настройката „%s=%s“ не може да се зададе"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "„log.excludeDecoration“ не може да се настрои"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "отдалеченият указател „HEAD“ не сочи към клон: „%.*s“"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"името на стандартния клон на отдалеченото хранилище не може да се получи, "
+"затова ще се ползва локално настроеното име на стандартния клон"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "неуспешно получаване на името на стандартния клон"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "хранилището не може да бъде отчислено"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "зачислената директория не може да бъде изтрита"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "към кой клон да се премине след клониране"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "при клониране да се създава пълна работна директория"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "да се свалят метаданните само за изтегляния клон"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "името на работното дърво не може да се извлече от „%s“"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "директорията „%s“ вече съществува"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "основният клон на „%s“ не може да бъде получен"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "отдалеченото хранилище в „%s“ не може да се настрои"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "„%s“ не може да се настрои"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "неуспешно създаване на непълно хранилище, ще се опита пълно хранилище"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "не може да се настрои пълно клониране"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "„scalar list“ не приема аргументи"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "пренастройване на всички зачислени директории"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "опцията „--all“ и указването на зачислена директория не са съвместими"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "вече няма хранилище на git в „%s“"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run ЗАДАЧА [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]\n"
+"Задачи:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "няма задача с име „%s“"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete ЗАЧИСЛЕНА_ДИРЕКТОРИЯ"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "текущата работна директория няма да бъде изтрита"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "включване и на версията на git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "включване и на опциите за компилиране на git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar КОМАНДА [ОПЦИЯ…]<\n"
+"\n"
+"Команди:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "липсва информация за компилатора\n"
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr "повече подробности"
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr "по-малко подробности"
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr "да се показват такъв БРОЙ цифри от имената на обектите"
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr "изчитане на пътищата от ФАЙЛ"
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия "
"знак „NUL“"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr "КЛЮЧ"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
msgstr "Извеждане на каноничните име и адрес на е-поща на контактите"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Проверка дали името на указателя е по правилата"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr ""
"Преминаване към друг клон или възстановяване на файловете в работното дърво"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Копиране на файлове от индекса към работното дърво"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Проверка дали името на указателя е по правилата"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr ""
"Добавяне или обработка на структурирана информация в съобщенията при подаване"
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Разглеждане на хранилище на Git"
-
-#: command-list.h:117
msgid "Show commit logs"
msgstr "Извеждане на журнала с подаванията"
-#: command-list.h:118
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "Извеждане на информация за файловете в индекса и работното дърво"
-#: command-list.h:119
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Извеждане на указателите в отдалечено хранилище"
-#: command-list.h:120
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Извеждане на съдържанието на обект-дърво"
-#: command-list.h:121
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Изваждане на кръпка и авторството от е-писмо"
-#: command-list.h:122
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Проста програма за разделяне на файлове във формат UNIX mbox"
-#: command-list.h:123
+#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git"
-#: command-list.h:124
+#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "Сливане на две или повече поредици/истории от промени"
-#: command-list.h:125
+#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "Откриване на най-подходящите общи предшественици за сливане"
-#: command-list.h:126
+#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "Изпълнение на тройно сливане"
-#: command-list.h:127
+#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "Сливане на файловете, които се нуждаят от това"
-#: command-list.h:128
+#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "Стандартната помощна програма за „git-merge-index“"
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Извеждане на тройно сливане без промяна на индекса"
+
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане"
#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Извеждане на тройно сливане без промяна на индекса"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Запис и проверка на индексите за множество пакети"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Създаване на обект-етикет с допълнителни проверки"
-#: command-list.h:133
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Създаване на обект-дърво от текст във формат „ls-tree“"
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Запис и проверка на индексите за множество пакети"
+
+#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Преместване или преименуване на файл, директория или символна връзка"
-#: command-list.h:135
+#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "Откриване на имената дадени на версия"
-#: command-list.h:136
+#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "Добавяне или преглед на бележки към обект"
-#: command-list.h:137
+#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "Внасяне и подаване към хранилища на Perforce"
-#: command-list.h:138
+#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "Създаване на пакетиран архив от обекти"
-#: command-list.h:139
+#: command-list.h:138
msgid "Find redundant pack files"
msgstr "Намиране на повтарящи се пакетни файлове"
-#: command-list.h:140
+#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "Пакетиране на върховете и етикетите за бърз достъп до хранилище"
-#: command-list.h:141
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Генериране на уникален идентификатор на кръпка"
-#: command-list.h:142
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "Окастряне на всички недостижими обекти в базата от данни за обектите"
-#: command-list.h:143
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Изтриване на допълнителните обекти, които вече са в пакетни файлове"
-#: command-list.h:144
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Доставяне и внасяне на промените от друго хранилище или клон"
-#: command-list.h:145
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "Обновяване на отдалечените указатели и свързаните с тях обекти"
-#: command-list.h:146
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Прилагане на поредица от кръпки от quilt към текущия клон"
-#: command-list.h:147
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "Сравняване на два диапазона от подавания (напр. две версии на клон)"
-#: command-list.h:148
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Изчитане на информация за обект-дърво в индекса"
-#: command-list.h:149
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Прилагане на подаванията върху друг връх"
-#: command-list.h:150
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Получаване на изтласканото в хранилището"
-#: command-list.h:151
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Управление на информацията в журнала на указателите"
-#: command-list.h:152
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Управление на набор от следени хранилища"
-#: command-list.h:153
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Пакетиране на непакетираните обекти в хранилище"
-#: command-list.h:154
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Създаване, извеждане, изтриване на указатели за замяна на обекти"
-#: command-list.h:155
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Обобщение на предстоящите промени"
-#: command-list.h:156
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Преизползване на вече запазено коригиране на конфликт при сливане"
-#: command-list.h:157
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Привеждане на указателя „HEAD“ към зададеното състояние"
-#: command-list.h:158
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Възстановяване на файловете в работното дърво"
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Отменяне на съществуващи подавания"
-
-#: command-list.h:160
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Извеждане на подаванията в обратна хронологическа подредба"
-#: command-list.h:161
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Избор и промяна на параметри"
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Отменяне на съществуващи подавания"
+
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Изтриване на файлове от работното дърво и индекса"
-#: command-list.h:163
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Изпращане на поредица от кръпки по е-поща"
-#: command-list.h:164
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Изтласкване на обекти по протокола на Git към друго хранилище"
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
+
#: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Настройки на Git за скриптовете на обвивката"
+
+#: command-list.h:166
msgid "Restricted login shell for Git-only SSH access"
msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
-#: command-list.h:166
+#: command-list.h:167
msgid "Summarize 'git log' output"
msgstr "Обобщен изход от „git log“"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show various types of objects"
msgstr "Извеждане на различните видове обекти в Git"
-#: command-list.h:168
+#: command-list.h:169
msgid "Show branches and their commits"
msgstr "Извеждане на клоните и подаванията в тях"
-#: command-list.h:169
+#: command-list.h:170
msgid "Show packed archive index"
msgstr "Извеждане на индекса на пакетирания архив"
-#: command-list.h:170
+#: command-list.h:171
msgid "List references in a local repository"
msgstr "Извеждане на указателите в локално хранилище"
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
-
#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Настройки на Git за скриптовете на обвивката"
-
-#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Инициализиране и промяна на частичното изтегляне"
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Добавяне на съдържанието на файла към индекса"
+
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Скатаване на неподадените промени в работното дърво"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Добавяне на съдържанието на файла към индекса"
-
-#: command-list.h:176
msgid "Show the working tree status"
msgstr "Извеждане на състоянието на работното дърво"
-#: command-list.h:177
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Премахване на излишните знаци за интервали"
-#: command-list.h:178
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Инициализиране, обновяване или разглеждане на подмодули"
-#: command-list.h:179
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двупосочна работа между хранилища под Subversion и Git"
-#: command-list.h:180
+#: command-list.h:179
msgid "Switch branches"
msgstr "Преминаване към друг клон"
-#: command-list.h:181
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Извеждане, промяна и изтриване на символни указатели"
-#: command-list.h:182
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
-#: command-list.h:183
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
-#: command-list.h:184
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Разпакетиране на обекти от пакетиран архив"
-#: command-list.h:185
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
-#: command-list.h:186
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "Безопасно обновяване на името на обект в указател"
-#: command-list.h:187
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
-#: command-list.h:188
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Изпращане на архива обратно към „git-archive“"
-#: command-list.h:189
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
-#: command-list.h:190
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Извеждане на логическа променлива на Git"
-#: command-list.h:191
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Проверка на подписите GPG върху подаванията"
-#: command-list.h:192
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Проверка на пакетираните архивни файлове на Git"
-#: command-list.h:193
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Проверка на подписите GPG върху етикетите"
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Уеб интерфейс на Git"
-
-#: command-list.h:195
+#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
-#: command-list.h:196
+#: command-list.h:194
msgid "Manage multiple working trees"
msgstr "Управление на множество работни дървета"
-#: command-list.h:197
+#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr "Създаване на обект-дърво от текущия индекс"
-#: command-list.h:198
+#: command-list.h:196
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: command-list.h:199
+#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr "Команден ред и конвенции на Git"
-#: command-list.h:200
+#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr "Въвеждащ урок в Git за разработчици"
-#: command-list.h:201
+#: command-list.h:199
msgid "Providing usernames and passwords to Git"
msgstr "Въвеждане на имена и пароли към Git"
-#: command-list.h:202
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git за потребители на CVS"
-#: command-list.h:203
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Настройване на изгледа на разликите"
-#: command-list.h:204
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
-#: command-list.h:205
+#: command-list.h:203
msgid "Frequently asked questions about using Git"
msgstr "Често задавани въпроси за употребата на Git"
-#: command-list.h:206
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Речник с термините на Git"
-#: command-list.h:207
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Куки на Git"
-#: command-list.h:208
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Разглеждане на хранилище на Git"
+
+#: command-list.h:208
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Съответствия на имена на автор/подаващ и/или адреси на е-поща"
-#: command-list.h:210
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: command-list.h:211
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Пространства от имена на Git"
-#: command-list.h:212
+#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "Помощни програми за работа с отдалечените хранилища"
-#: command-list.h:213
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Устройство на хранилището на Git"
-#: command-list.h:214
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: command-list.h:215
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Монтиране на едно хранилище в друго"
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Въвеждащ урок за Git"
+
#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Въвеждащ урок за Git: втора част"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Ð\92Ñ\8aвеждаÑ\89 Ñ\83Ñ\80ок за Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Уеб инÑ\82еÑ\80Ñ\84ейÑ\81 на Git"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgid "usage: $dashless $USAGE"
msgstr "Употреба: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Не може да се премине към „$cdup“ — основната директория на работното дърво."
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"ФАТАЛНА ГРЕШКА: „$program_name“ не може да се ползва без работно дърво."
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Не може да презапишете клоните, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Не може да изпълните „$action“, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Не може да изпълните „$action“, защото в индекса има неподадени промени."
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr "Освен това в индекса има неподадени промени."
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Тази команда трябва да се изпълни от основната директория на работното дърво"
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr "Абсолютният път на работното дърво не може да се определи"
msgstr ""
"файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a — прилагане на това и всички следващи парчета от файла\n"
"d — без прилагане на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e — ръчно редактиране на текущото парче\n"
"? — извеждане не помощта\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Избраните парчета не може да се добавят в индекса!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "пренебрегване на неслятото: „%s“\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Няма други парчета\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Неправилен номер: „%s“\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Има само %d парче.\n"
msgstr[1] "Има само %d парчета.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Няма други парчета за търсене\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Сгрешен регулярен израз „%s“: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Никое парче не напасва на регулярния израз\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Няма друго парче преди това\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Няма друго парче след това\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Това парче не може да бъде разделено\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Разделяне на %d парче.\n"
msgstr[1] "Разделяне на %d парчета.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Това парче не може да бъде редактирано\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
" и индекса\n"
"add untracked — добавяне на неследените файлове към промените в индекса\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "„--“ липсва"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "неизвестна стратегия за прилагане на кръпка към „--patch“: „%s“"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
"разликата между местния часови пояс и GMT съдържа дробна част от минута\n"
"\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ не завърши успешно, а с код %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
"текстовият редактор приключи работата с грешка, всичко се преустановява"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"забележете знака „e“. За да изключите тази проверка, задайте\n"
"настройката „sendemail.forbidSendmailVariables“ да е „false“ (лъжа̀).\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"„batch-size“ и „relogin“ трябва да се указват заедно (или чрез командния "
"ред, или чрез настройките)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Непозната стойност за „--confirm“: %s\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: псевдоними за sendmail съдържащи кавички („\"“) не се "
"поддържат: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" ● укажете „./%s“ за файл;\n"
" ● използвате опцията „--format-patch“ за диапазон.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Директорията „%s“ не може да се отвори: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"Не са указани кръпки!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "В „%s“ липсва тема"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "„%s“ не може да се отвори за запис: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "„%s“ не може да се отвори: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "„%s.final“ не може да се отвори: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Обобщаващото писмо е празно и се прескача\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Следните файлове са 8 битови, но не са с обявена заглавна част „Content-"
"Transfer-Encoding“.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n"
"„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "На кой да се пратят е-писмата (незадължително поле)"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ е псевдоним на себе си\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Идентификатор на съобщение „Message-ID“, което да се използва за обявяването "
"на отговор „In-Reply-To“ (незадължително поле)"
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
"„e“ (редактиране): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Пътят към сертификат „%s“ не съществува."
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Изпращане на е-писмото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
"„a“ (всичко): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Изискване на отговор към това е-писмо"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Сървърът за SMTP не е настроен правилно."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сървърът не поддържа „STARTTLS“! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Неуспешно изпълнение на STARTTLS! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
"използвайте опцията: „--smtp-debug“."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "„%s“ не може да бъде изпратен\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Проба за изпращане на „%s“\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Изпращане на „%s“\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Успех при пробата. От журнала:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "Успех. От журнала:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Резултат: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Резултат: успех\n"
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "файлът „%s“ не може да бъде отворен"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да бъде се изпълни „%s“"
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "неправилно кодиране за пренос"
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "„%s“ не може да се отвори: %s\n"
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"ФАТАЛНА ГРЕШКА: %s: %d е повече от 998 знака\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "„%s“ се пропуска, защото е с разширение за архивен файл: „%s“.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-10 22:00+0100\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
+"PO-Revision-Date: 2022-01-12 21:11+0100\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 3.0.1\n"
#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "impossible de lire l'index"
msgid "could not stage '%s'"
msgstr "impossible d'indexer '%s'"
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "impossible d'écrire l'index"
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
msgid "ignoring unmerged: %s"
msgstr "fichier non-fusionné ignoré : %s"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Réviser la différence"
msgid "(empty) select nothing"
msgstr "(vide) ne rien sélectionner"
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Et maintenant"
msgid "unstaged"
msgstr "non-indexé"
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "chemin"
msgid "could not refresh index"
msgstr "impossible de rafraîchir l'index"
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
"a - indexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas indexer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
"a - remiser cette section et toutes les suivantes de ce fichier\n"
"d - ne pas remiser cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas désindexer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas éliminer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Les appliquer quand même à l'arbre de travail ? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Rien n'a été appliqué.\n"
msgid "No other hunks to goto"
msgstr "Aucune autre section à atteindre"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "aller à quelle section (<ret> pour voir plus) ? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "aller à quelle section ? "
msgid "No other hunks to search"
msgstr "Aucune autre section à rechercher"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "rechercher la regex ? "
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way hors d'un dépôt"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index hors d'un dépôt"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached hors d'un dépôt"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' hors d'un dépôt"
#: apply.c:800
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Application d'une fusion à 3 points…\n"
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Échec de l'application de la fusion à 3 points…\n"
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Retour à une application directe…\n"
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "entrée non reconnue"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")"
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "num"
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr "action"
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "mode verbeux"
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "racine"
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "ne pas renvoyer d'erreur pour les rustines vides"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "impossible de démarrer le filtre '%s'"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "impossible de rediriger un descripteur"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "le filtre '%s' a retourné une erreur"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "impossible de lire %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "préfixe"
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "fichier"
msgstr "afficher les formats d'archive supportés"
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "dépôt"
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr "commande"
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "l'option '%s' requiert '%s'"
#: archive.c:582
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-"Les options --add-file et --remote ne peuvent pas être utilisées ensemble"
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
"dernier commit"
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr "impossible de lire le blob %s pour le chemin %s"
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"\n"
-"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
-"l'information de suivi distant en invoquant\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"impossible d'hériter la configuration de suivi de référence amont depuis "
+"plusieurs références quand un rebasage est demandé"
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "La branche %s ne peut pas être sa propre branche amont."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "la branche %s ne peut pas être sa propre branche amont"
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr ""
-"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "
-"en rebasant."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant."
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
-"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "
-"'%s'."
+msgid "branch '%s' set up to track '%s'."
+msgstr "la branche '%s' est paramétrée pour suivre '%s'."
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
-"rebasant."
+msgid "branch '%s' set up to track:"
+msgstr "la branche '%s' est paramétrée pour suivre :"
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "échec de l'écriture de la configuration de branche amont"
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
-"rebasant."
+"\n"
+"Après correction de la cause de l'erreur, vous pouvez essayer\n"
+"de corriger l'information de suivi distant en invoquant :"
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré"
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
-"rebasant."
+"héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion "
+"renseignée"
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "pas de suivi : information ambiguë pour la référence %s"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Échec de l'écriture de la configuration de branche amont"
-
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Pas de suivi : information ambiguë pour la référence %s"
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' n'est pas un nom de branche valide"
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' n'est pas un nom de branche valide."
+msgid "a branch named '%s' already exists"
+msgstr "Une branche nommée '%s' existe déjà"
-#: branch.c:208
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Une branche nommée '%s' existe déjà."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Impossible de forcer la mise à jour de la branche courante."
+msgid "cannot force update the branch '%s'checked out at '%s'"
+msgstr ""
+"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
msgstr ""
-"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
-"pas une branche."
+"Impossible de configurer le suivi de branche ; le point de départ '%s' n'est "
+"pas une branche"
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
"pour paramétrer le suivi distant en même temps que vous poussez."
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nom d'objet invalide : '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "nom d'objet invalide : '%s'"
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objet ambigu : '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "Nom d'objet ambigu : '%s'"
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Point d'embranchement invalide : '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "point d'embranchement invalide : '%s'"
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "la section finale a un id non nul %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "valeur invalide de couleur : %.*s"
msgid "unable to find all commit-graph files"
msgstr "impossible de trouver tous les fichiers du graphe de commit"
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"position de commit invalide. Le graphe de commit est vraisemblablement "
"corrompu"
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr "impossible de trouver le commit %s"
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"le graphe de commits requiert des données de génération de débordement mais "
"n'en contient pas"
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "impossible d'obtenir le type de l'objet %s"
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr "Lecture des commits connus dans un graphe de commit"
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr "Expansion des commits joignables dans un graphe de commit"
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr "Suppression les marques de commit dans le graphe de commits"
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr "Calcul des niveaux topologiques du graphe de commits"
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr "Calcul des chiffres de génération du graphe de commits"
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr "Collecte des commits référencés"
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr "erreur à l'ajout du packet %s"
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr "erreur à l'ouverture de l'index pour %s"
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr "impossible de créer les répertoires de premier niveau de %s"
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr "impossible de créer une couche de graphe temporaire"
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "impossible de régler les droits partagés pour '%s'"
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Écriture le graphe de commits en %d passe"
msgstr[1] "Écriture le graphe de commits en %d passes"
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr "impossible d'ouvrir le fichier de graphe de commit"
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr "échec du renommage du fichier de graphe de commits"
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr "impossible de renommer le fichier temporaire de graphe de commits"
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr "Analyse des commits de fusion"
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr "Fusion du graphe de commits"
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr "trop de commits pour écrire un graphe"
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"le graphe de commit a une somme de contrôle incorrecte et est "
"vraisemblablement corrompu"
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
"%u != %u"
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr "Verification des commits dans le graphe de commits"
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"échec de l'analyse du commit %s depuis la base de données d'objets pour le "
"graphe de commit"
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
"%s"
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"la liste des parents du graphe de commit pour le commit %s est trop longue"
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "le parent du graphe de commit pour %s est %s != %s"
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
"non-nul ailleurs"
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
"mais nul ailleurs"
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"la date de validation pour le commit %s dans le graphe de commit est "
"%<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr "la clé ne contient pas de nom de variable : %s"
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la référence '%s' ne pointe pas sur un blob"
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
"100"
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "impossible de réaliser un mmap de '%s'%s"
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
"arbre de travail"
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
"d'autres modes d'espace"
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "
-"avec -S"
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s'"
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"
-"pickaxe-all avec -G et -S"
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s' et '%s'"
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "valeur invalide de --stat : %s"
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s attend une valeur numérique"
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valeur inconnue après ws-error-highlight=%.*s"
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "forme <n>/<m> attendue par %s"
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "caractère attendu par %s, '%s' trouvé"
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mauvais argument --color-moved : %s"
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode invalide '%s' dans --color-moved-ws"
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
"\"histogram\""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "argument invalide pour %s"
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex invalide fournie à -I : '%s'"
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mauvais argument pour --word-diff : %s"
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr "Options de format de sortie de diff"
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "générer la rustine"
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "<n>"
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "générer les diffs avec <n> lignes de contexte"
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "générer le diff en format brut"
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr "synonyme de '-p --raw'"
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "synonyme de '-p --stat'"
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "--stat pour traitement automatique"
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "afficher seulement la dernière ligne de --stat"
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"afficher la distribution des quantités de modifications relatives pour "
"chaque sous-répertoire"
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "synonyme pour --dirstat=cumulative"
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonyme pour --dirstat=files,param1,param2..."
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avertir si les modifications introduisent des marqueurs de conflit ou des "
"erreurs d'espace"
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"résumé succinct tel que les créations, les renommages et les modifications "
"de mode"
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "n'afficher que les noms de fichiers modifiés"
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "n'afficher que les noms et les status des fichiers modifiés"
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr "générer un diffstat"
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "<largeur>"
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "générer un diffstat avec la largeur indiquée"
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "génerer un diffstat avec la largeur de nom indiquée"
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "génerer un diffstat avec la largeur de graphe indiquée"
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr "<compte>"
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "générer un diffstat avec des lignes limitées"
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "générer une résumé compact dans le diffstat"
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "produire un diff binaire qui peut être appliqué"
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"afficher les noms complets des objets pre- et post-image sur les lignes "
"\"index\""
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr "afficher un diff coloré"
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr "<sorte>"
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
"'nouveau' dans le diff"
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
"champs dans --raw ou --numstat"
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "<préfixe>"
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"afficher le contexte entre les sections à concurrence du nombre de ligne "
"indiqué"
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "<caractère>"
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr "Options de renommage de diff"
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"casser les modifications d'une réécrire complète en paires de suppression et "
"création"
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr "détecter les renommages"
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "supprimer la pré-image pour les suppressions"
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr "détecter les copies"
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr ""
"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr "désactiver la détection de renommage"
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "utiliser des blobs vides comme source de renommage"
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
"copie excède la limite indiquée"
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "Options de l'algorithme de diff"
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "produire le diff le plus petit possible"
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "ignorer les espaces lors de la comparaison de ligne"
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "ignorer des modifications du nombre d'espaces"
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "ignorer des modifications d'espace en fin de ligne"
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "ignore le retour chariot en fin de ligne"
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "ignorer les modifications dont les lignes sont vides"
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heuristique qui déplace les limites de sections de diff pour faciliter la "
"lecture"
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
"générer un diff en utilisant l'algorithme de différence \"histogramme\""
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr "<algorithme>"
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "choisir un algorithme de différence"
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr "<texte>"
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"afficher des différences par mot, en utilisant <mode> pour délimiter les "
"mots modifiés"
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "utiliser <regex> pour décider ce qu'est un mot"
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "les lignes déplacées sont colorées différemment"
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr "comment les espaces sont ignorés dans --color-moved"
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr "Autres options diff"
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"lancé depuis un sous-répertoire, exclure les modifications en dehors et "
"afficher les chemins relatifs"
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr "traiter les fichiers comme texte"
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "échanger les entrées, inverser le diff"
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "désactiver tous les affichages du programme"
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "autoriser l'exécution d'un assistant externe de diff"
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"lancer les filtres externes de conversion en texte lors de la comparaison de "
"fichiers binaires"
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr "<quand>"
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"ignorer les modifications dans les sous-modules lors de la génération de diff"
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr "<format>"
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "spécifier comment les différences dans les sous-modules sont affichées"
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "masquer les entrées 'git add -N' de l'index"
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr "<chaîne>"
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"rechercher les différences qui modifient le nombre d'occurrences de la "
"chaîne spécifiée"
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"rechercher les différences qui modifient le nombre d'occurrences de la regex "
"spécifiée"
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr ""
"afficher toutes les modifications dans l'ensemble de modifications avec -S "
"ou -G"
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "<chemin>"
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "afficher la modification dans le chemin spécifié en premier"
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "sauter la sortie pour le chemin spécifié"
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr "<id-objet>"
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
"indiqué"
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr "sélectionner les fichiers par types de diff"
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr "<fichier>"
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "Sortie vers un fichier spécifié"
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"détection exhaustive de renommage annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
"recherche uniquement des copies par modification de chemin à cause d'un trop "
"grand nombre de fichiers."
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
"votre fichier d'extraction partielle pourrait présenter des problèmes : le "
"motif '%s' est répété"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "désactivation de la correspondance de motif de cone"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr "le cache non suivi est désactivé sur ce système ou sur cet endroit"
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr "fichier d'index corrompu dans le dépôt %s"
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
"suggestion : en attente de la fermeture du fichier par votre éditeur de "
"texte…%c"
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr "Filtrage du contenu"
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "espaces de nom de Git \"%s\""
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : liste superficielle attendue"
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack : paquet de vidage attendu après une liste superficielle"
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "impossible d'écrire sur un distant"
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc nécessite multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "erreur dans l'objet : %s"
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "pas de superficiel trouvé : %s"
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "fait"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack : sortie d'index de pack invalide"
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "Le serveur supporte %s"
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "le dépôt source est superficiel, clonage rejeté."
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "le serveur ne supporte pas l'algorithme '%s'"
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "Le serveur ne supporte pas les requêtes superficielles"
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "Le serveur supporte filter"
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "impossible d'écrire la requête sur le distant"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "erreur à la lecture de l'entête de section '%s'"
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr "fichier paquet attendu à envoyer après 'ready'"
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "erreur lors du traitement de l'information de superficialité : %d"
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "erreur lors du traitement des références voulues : %d"
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack : paquet de fin de réponse attendu"
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "'ready' inattendu depuis le distant"
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
"gpg.ssh.allowedSignersFile doit exister et être configuré pour la "
"vérification de signature ssh"
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de "
"signature ssh (disponible depuis openssh version 8.2p1+)"
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s"
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "signature incompatible ou mauvaise '%s'"
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr ""
"gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s"
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr "user.signingkey doit être configuré pour pour signer avec ssh"
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "impossible d'écrire la clé de signature ssh dans '%s'"
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'"
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
"ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible "
"dans openssh version 8.2p1+)"
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
"supporté qu'avec -P avec PCRE v2"
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Lancer '%s' à la place ? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Lancer '%s' à la place [y/N] ? "
#: help.c:654
#, c-format
msgid "quoted CRLF detected"
msgstr "CRLF citées détectées"
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "action invalide '%s' pour '%s'"
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
"Version %s de %s laissée dans l'arbre."
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
"fusion :\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "Déjà à jour."
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille"
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "le fichier d'index multi-paquet %s est trop petit"
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
"0x%08x"
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
"version %u"
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "index multi-paquet manque de tronçon de nom de paquet"
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "index multi-paquet manque de tronçon de recherche OID requis"
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "impossible de stocker le fichier d'index inversé"
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr "impossible d'analyser la ligne : %s"
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr "ligne malformée : %s"
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr "impossible de charger le paquet"
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr "impossible d'ouvrir l'index pour %s"
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "Ajout de fichiers paquet à un index multi-paquet"
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "paquet préféré inconnu : %s"
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet"
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "fichier paquet à éliminer %s non trouvé"
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "le paquet préféré '%s' est expiré"
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr "aucun fichier paquet à l'index."
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr "impossible d'écrire le bitmap multi-paquet"
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr "échec de l'écriture de l'index de multi-paquet"
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "somme de contrôle incorrecte"
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "Recherche de fichiers paquets référencés"
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "le midx ne contient aucun oid"
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "Classement des objets par fichier paquet"
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "Comptage des objets référencés"
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "Recherche et effacement des fichiers paquets non-référencés"
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "impossible de démarrer le groupement d'objets"
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "impossible de finir le groupement d'objets"
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "impossible de normaliser le répertoire d'objet : %s"
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr "lecture du fichier d'alternatives impossible"
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr "impossible de déplacer le nouveau fichier d'alternative"
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr "impossible de trouver le répertoire objet correspondant à %s"
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr "échec de mmap%s"
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr "le fichier objet %s est vide"
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objet libre corrompu '%s'"
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "données incorrectes à la fin de l'objet libre '%s'"
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr "impossible d'analyser l'entête %s"
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr "type d'objet invalide"
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr "impossible de dépaqueter l'entête %s"
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr "entête de %s trop long, attendu %d octets"
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr "impossible de lire l'objet %s"
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr "remplacement %s non trouvé pour %s"
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr "impossible d'écrire le fichier %s"
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossible de régler les droits de '%s'"
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr "erreur d'écriture d'un fichier"
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr "erreur en fermeture du fichier d'objet esseulé"
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr "impossible d'écrire le fichier d'objet esseulé"
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossible de compresser le nouvel objet %s (%d)"
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "échec de deflateEnd sur l'objet %s (%d)"
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "données de source d'objet instable pour %s"
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "échec de utime() sur %s"
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr "impossible de lire l'objet pour %s"
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr "commit corrompu"
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr "étiquette corrompue"
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr "erreur de lecture à l'indexation de %s"
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr "lecture tronquée pendant l'indexation de %s"
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s : échec de l'insertion dans la base de données"
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté"
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide"
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "incohérence de hachage pour %s (%s attendu)"
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr "impossible de mmap %s"
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossible de dépaqueter l'entête de %s"
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr "impossible d'analyser l'entête de %s"
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossible de dépaqueter le contenu de %s"
msgid "hash mismatch %s"
msgstr "incohérence de hachage %s"
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr "l'index inverse requis manque dans l'index multi-paquet"
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr "load_reverse_index : impossible d'ouvrir le paquet"
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "impossible de récupérer la taille de %s"
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr "impossible de trouver %s dans le paquet %s à l'offset %<PRIuMAX>"
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "impossible de récupérer l'utilisation du disque de %s"
msgid "could not write '%s' promisor file"
msgstr "impossible d'écrire le fichier de prometteur '%s'"
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "le fichier paquet %s ne peut être mmap%s"
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'option '%s' attend une valeur numérique"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "date d'expiration malformée : '%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'option '%s' attend \"%s\" ou \"%s\""
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "alias pour --%s"
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "option inconnue « %s »"
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "bascule inconnue « %c »"
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "option non-ascii inconnue dans la chaîne : '%s'"
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " ou : %s"
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr "%*s%s"
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-NUM"
msgid "the remote end hung up unexpectedly"
msgstr "l'hôte distant a fermé la connexion de manière inattendue"
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "erreur de protocole : mauvaise longueur de ligne %d"
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "erreur distante : %s"
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le commit '%s'"
msgid "failed to generate diff"
msgstr "échec de la génération de diff"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only et --right-only sont mutuellement exclusifs"
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "impossible d'analyser le journal pour '%s'"
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr "impossible de créer un blob vide dans la base de donnée d'objets"
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
"répertoires git"
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' n'a pas de commit extrait"
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr "indexation du fichier '%s' impossible"
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr "impossible d'ajouter '%s' à l'index"
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr "fstat de '%s' impossible"
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' existe à la fois comme un fichier et un répertoire"
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr "Rafraîchir l'index"
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"index.version renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr "signature incorrecte 0x%08x"
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr "mauvaise version d'index %d"
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr "mauvaise signature sha1 d'index"
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr "extension %.4s ignorée"
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrée d'index inconnu 0x%08x"
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "champ de nom malformé dans l'index, près du chemin '%s'"
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr "entrées de préparation non ordonnées dans l'index"
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entrées de préparation non ordonnées pour '%s'"
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "impossible de créer le fil load_cache_entries : %s"
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "impossible de joindre le fil load_cache_entries : %s"
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr "%s : l'ouverture du fichier d'index a échoué"
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s : impossible de faire un stat sur l'index ouvert"
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s : fichier d'index plus petit qu'attendu"
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s : impossible de mapper le fichier d'index%s"
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "impossible de créer le fil load_index_extensions : %s"
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "impossible de joindre le fil load_index_extensions : %s"
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "impossible de rafraîchir l'index partagé '%s'"
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index cassé, %s attendu dans %s, %s obtenu"
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr "échec de conversion d'un index clairsemé"
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr "impossible de stat '%s'"
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "impossible de régler les bits de droit de '%s'"
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s : impossible de revenir à l'étape 0"
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "%s : 'preserve' a été remplacé par 'merges'"
# à priori on parle d'une branche ici
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr "disparue"
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) n'accepte pas d'argument"
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) non reconnu : %s"
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) non reconnu : %s"
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) non reconnu : %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "argument %%(raw) non reconnu : %s"
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valeur positive attendue '%s' dans %%(%s)"
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument '%s' non reconnu dans %%(%s)"
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) non reconnu : %s"
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) non reconnu : %s"
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
msgstr ""
"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format : atome %%(%s) utilisé sans un atome %%(%s)"
#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'option '%s' doit pointer sur un commit"
msgid "invalid branch name: %s = %s"
msgstr "nom de branche invalide : %s = %s"
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr "symref pendant %s ignoré"
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "le journal pour la réf %s contient un trou après %s"
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr "le journal pour la réf %s est vide"
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "échec de update_ref pour la réf '%s' : %s"
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mises à jour multiples pour la réf '%s' non permises"
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr "mises à jour des références annulées par le crochet"
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe ; impossible de créer '%s'"
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossible de traiter '%s' et '%s' en même temps"
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
msgid "invalid refspec '%s'"
msgstr "spécificateur de réference invalide : '%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"un raccourci de configuration de distant ne peut pas commencer par '/' : %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "plus d'un receivepack fournis, utilisation du premier"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "plus d'un uploadpack fournis, utilisation du premier"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "la clé '%s' du modèle n'a pas de '*'"
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "la valeur '%s' du modèle n'a pas de '*'"
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
"le spécificateur de référence source %s ne correspond à aucune référence"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
"totalement qualifiée."
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
"'%s:refs/heads/%s' ?"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "'%s' ne peut pas être résolue comme une branche"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "suppression de '%s' impossible : la référence distante n'existe pas"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
"le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
"références"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
"branche locale de suivi"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "impossible de trouver la référence distante %s"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Référence bizarre '%s' ignorée localement"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Votre branche et '%s' font référence à des commits différents.\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (utilisez \"%s\" pour plus de détails)\n"
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "impossible d'analyser le nom attendu d'objet '%s'"
msgid "there were errors while writing '%s' (%s)"
msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "échec du flush de '%s'"
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
msgid "could not determine HEAD revision"
msgstr "impossible de déterminer la révision HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "impossible de trouver l'arbre de %s"
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input est incompatible avec --no-walk"
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<fichier-paquet> n'est plus géré"
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk est incompatible avec --unsorted-input"
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "impossible de créer un fil asynchrone : %s"
msgid "could not delete '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
"Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n"
"lancez \"git revert --abort\"."
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
msgid "unable to dequote value of '%s'"
msgstr "impossible de décoter la valeur de '%s'"
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr "impossible de résoudre HEAD après création du commit"
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s n'est pas un commit !"
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr "identité d'auteur invalide '%s'"
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr "auteur corrompu : information de date manquante"
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossible d'analyser le commit parent %s"
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr "Le premier message de validation sera ignoré :"
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr "impossible d'obtenir un message de validation pour %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr "annulation d'un picorage en cours"
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr "annulation d'un retour en cours"
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr "un retour est déjà en cours"
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr "un picorage est déjà en cours"
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr "pas de retour en cours"
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr "aucun picorage en cours"
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr "échec du saut de commit"
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr "il n'y a rien à sauter"
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"avez-vous déjà validé ?\n"
"essayez \"git %s --continue\""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Impossible d'appliquer %s... %.*s"
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr "Exécution : %s\n"
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
"git rebase --continue\n"
"\n"
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr "et a mis à jour l'index ou l'arbre de travail\n"
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr "écriture de 'écraser-sur'"
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Réponse de remisage inattendue : '%s'"
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Impossible de créer le répertoire pour '%s'"
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autoremisage créé : %s\n"
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr "impossible de réinitialiser --hard"
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr "L'application du remisage automatique a créé des conflits."
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr "impossible de détacher HEAD"
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Arrêt à HEAD\n"
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Rebasage (%d/%d)%s"
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Arrêt à %s... %.*s\n"
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Rebasage et mise à jour de %s avec succès.\n"
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr "le commit %s appliqué précédemment a été sauté"
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés"
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr "make_script : erreur lors de la préparation des révisions"
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr "le script a déjà été réarrangé."
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' est hors du dépôt à '%s'"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
"n'existent pas localement."
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
"l'option '%s' doit être présente avant les arguments qui ne sont pas des "
"options"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
"impossible de mettre en place le répertoire de travail en utilisant une "
"configuration invalide"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "cette opération doit être effectuée dans un arbre de travail"
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "extension de dépôt inconnue trouvée :"
msgstr[1] "extensions de dépôt inconnues trouvées :"
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] ""
msgstr[1] ""
"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr "erreur à l'ouverture de '%s'"
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "trop gros pour être une fichier .git : '%s'"
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr "erreur à la lecture de %s"
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format de fichier git invalide : %s"
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr "aucun chemin dans le fichier git : %s"
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr "ce n'est pas un dépôt git : %s"
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' trop gros"
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr "ce n'est pas un dépôt git : '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr "impossible de revenir au répertoire de travail courant"
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "échec du stat de '%*s%s%s'"
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr "impossible de modifier en '%s'"
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas défini)."
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr "échec de la bifurcation"
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr "échec du setsid"
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
msgstr[0] "%u octet/s"
msgstr[1] "%u octets/s"
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr "impossible d'éditer '%s'"
msgid "process for submodule '%s' failed"
msgstr "le processus pour le sous-module '%s' a échoué"
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
msgid "invalid remote service path"
msgstr "chemin de service distant invalide"
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr "option non supportée par le protocole"
msgid "Aborting."
msgstr "Abandon."
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr "échec de la poussée de tous les sous-modules nécessaires"
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"contenus :\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"impossible de supprimer le répertoire de travail actuel :\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"Mise à jour impossible pour le sous-module :\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"clairsemés :\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"motifs clairsemés :\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"motifs clairsemés :\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"Après correction des chemins ci-dessus, vous voulez peut-être lancer `git "
"sparse-checkout reapply`.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Mise à jour des fichiers"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"sensibles à la casse dans une système de fichier insensible) et un\n"
"seul du groupe en collision est dans l'arbre de travail :\n"
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr "Mise à jour des drapeaux de l'index"
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "vidage attendu après les arguments de récupération"
msgid "Fetching objects"
msgstr "Récupération des objets"
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
"de travail"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' ne pointe pas en retour sur '%s'"
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "pas un répertoire"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ".git n'est pas un fichier"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr "fichier .git cassé"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr "fichier .git incorrect"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "pas un chemin valide"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "impossible de localiser le dépôt ; fichier .git cassé"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "gitdir non lisible"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "gitdir incorrect"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "pas un répertoire valide"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "le fichier gitdir n'existe pas"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "impossible de lire le fichier gitdir (%s)"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "fichier gitdir invalide"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "le fichier gitdir pointe sur un endroit inexistant"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Votre remisage contient actuellement %d entrée"
msgstr[1] "Votre remisage contient actuellement %d entrées"
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"de la branche.\n"
"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (utilisez \"git am --allow-empty\" pour enregistrer la rustine comme un "
+"commit vide)"
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
"modifications)"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "Picorage en cours."
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (lancez \"git cherry-pick --continue\" pour continuer)"
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "Rétablissement en cours."
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " (lancez \"git revert --continue\" pour continuer)"
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)"
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "Vous êtes dans une extraction clairsemée."
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
"présents."
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "Encore aucun commit sur "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "différent"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "derrière "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "impossible de trouver le commit %"
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "impossible de lire la réponse IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "impossible de démarrer accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "impossible de démarrer worker[0] pour '%s'"
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "mode verbeux"
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr ""
"permettre la mise à jour des entrées hors du cone d'extraction clairsemée"
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "backend pour `git stash -p`"
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"Éliminez ce message en lançant\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file est incompatible avec --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A et -u sont mutuellement incompatibles"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr ""
+"'%s' et les arguments de spécificateur de chemin ne peuvent pas être "
+"utilisés ensemble"
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"Éliminez ce message en lançant\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Valeur invalide pour --empty : %s"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "impossible d'analyser l'auteur du script"
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Pour enregistrer la rustine vide comme un commit vide, lancez \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1224
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
"être perdus."
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Le patch actuel est vide."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "ligne d'auteur manquante dans le commit %s"
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Ignoré : %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Création d'un commit vide : %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Le patch actuel est vide."
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "l'application de la rustine a échoué à %s %.*s"
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "aucune modification - enregistré comme un commit vide."
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valeur invalide pour --show-current-patch : %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "les options '%s=%s' et '%s=%s' ne peuvent pas être utilisées ensemble"
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "ajouter une ligne terminale Signed-off-by au message de validation"
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "le passer à travers git-mailinfo"
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr "n"
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr "restaurer la branche originale et abandonner les applications de patch"
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr "abandonne l'opération de patch mais garde HEAD où il est"
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "afficher le patch en cours d'application"
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "enregistrer la rustine vide comme un commit vide"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "comment gérer les rustines vides"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
"reprise."
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "le mode interactif requiert des rustines sur la ligne de commande"
msgid "show work cost statistics"
msgstr "montrer les statistiques de coût d'activité"
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
msgid "ignore whitespace differences"
msgstr "ignorer les différences d'espace"
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "rév"
"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
"de-fonction>"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "le fichier %s n'a qu'%lu ligne"
msgstr[1] "le fichier %s n'a que %lu lignes"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "Assignation de blâme aux lignes"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<options>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"La branche '%s' n'est pas totalement fusionnée.\n"
"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "impossible d'analyser la chaîne de format"
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pointe hors de refs/heads/"
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr "impossible de copier la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "Échec de copie de la branche"
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Création d'une copie d'une branche mal nommée '%s'"
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branche est copiée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "régler le mode de suivi (voir git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "règler la configuration des branches de suivi"
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "désactiver l'information amont"
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "copier une branche et son reflog"
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "copier une branche, même si la cible existe"
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "afficher le nom de la branche courante"
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr "objet"
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column et --verbose sont incompatibles"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "trop d'arguments pour spécifier une branche amont"
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"branche.\n"
"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
#: builtin/bundle.c:185
msgid "Unbundling objects"
-msgstr "dépaquetage d'objets depuis un colis"
+msgstr "Dépaquetage d'objets"
#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
msgstr "git checkout--worker [<options>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr "chaîne"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "%d conflit du fusion recréé"
msgstr[1] "%d conflits du fusion recréés"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d chemin mis à jour depuis %s"
msgstr[1] "%d chemins mis à jour depuis %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "%d chemin mis à jour depuis l'index"
msgstr[1] "%d chemins mis à jour depuis l'index"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' ne peut pas être utilisé avec %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ni '%s', ni '%s' spécifié"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"suivants :\n"
"%s"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' pourrait être un fichier local ou un branche de suivi.\n"
"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "une seule référence attendue"
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "branche attendue, mais étiquette '%s' reçue"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "une branche est attendue, mais '%s' a été reçue"
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "une branche est attendue, mais un commit '%s' a été reçu"
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"impossible de basculer de branche pendant une fusion\n"
"Envisagez \"git merge --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"impossible de basculer de branche pendant une session am\n"
"Envisagez \"git am --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"impossible de basculer de branche pendant un rebasage\n"
"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"impossible de basculer de branche pendant un picorage\n"
"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"impossible de basculer de branche pendant un retour\n"
"Envisagez \"git revert --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "vous basculez de branche en cours de bissection"
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' n'accepte pas <point-de-départ>"
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "argument de branche ou de commit manquant"
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (merge (fusion) ou diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "style de conflit (merge (fusion), diff3 ou zdiff3)"
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p et --overlay sont mutuellement exclusifs"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr ""
+"les options '-%c', '-%c' et '%s' ne peuvent pas être utilisées ensemble"
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "nom de branche manquant ; essayez -%c"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "impossible de résoudre %s"
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file est incompatible avec --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file est incompatible avec --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "vous devez spécifier un ou des chemins à restaurer"
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "utiliser le mode de superposition (défaut)"
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "créer et basculer sur une nouvelle branche"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "créer/réinitialiser et basculer sur une branche"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr "interpréter 'git switch <branche-inexistante>'"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "laisser tomber les modifications locales"
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "de quel <arbre-esque> faire l'extraction"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "restaurer l'index"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "restaurer l'arbre de travail (par défaut)"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "ignorer les entrées non-fusionnées"
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "utiliser le mode de superposition"
msgid "could not lstat %s\n"
msgstr "lstat de %s impossible\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Refus de supprimer le répertoire de travail actuel\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Refuserait de supprimer le répertoire de travail actuel\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nom"
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr "profondeur"
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr "heure"
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
msgid "cannot unlink temporary alternates file"
msgstr "impossible de délier le fichier temporaire alternates"
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les options --bare et --origin %s sont incompatibles."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare et --separate-git-dir sont incompatibles."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble"
#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr "répertoire"
msgid "Collecting commits from input"
msgstr "Collecte des commits depuis l'entrée"
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "sous-commande non reconnue : %s"
msgid "duplicate parent %s ignored"
msgstr "le parent dupliqué %s est ignoré"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "nom d'objet invalide %s"
msgid "id of a parent commit object"
msgstr "id d'un objet commit parent"
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr "message"
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "message de validation"
msgid "read commit log message from file"
msgstr "lire le message de validation depuis un fichier"
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "impossible de combiner -m avec --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "les options '%s' et '%s.%s' ne peuvent pas être utilisées ensemble"
#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long et -z sont incompatibles"
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr ""
+"l'option de reformulation de '%s' et le chemin '%s' ne peuvent pas être "
+"utilisés ensemble"
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
msgstr ""
-"l'option reword de --fixup est mutuellement exclusive avec --patch/--"
-"interactive/--all/--include/--only"
+"l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés "
+"ensemble"
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "option inconnue : --fixup=%s:%s"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "calcule les valeurs complètes en avance/en retard"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr "version"
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr ""
"détecter les renommages, en spécifiant optionnellement le facteur de "
"similarité"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "date"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger ou reformuler le "
"commit spécifié"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr "ajouter des lignes terminales personnaliser"
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "ajouter une ligne terminale Signed-off-by"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation dû à un message de validation vide.\n"
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
"Abandon de la validation dû à un corps de message de validation vide.\n"
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
msgstr ""
"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long et --abbrev=0 sont incompatibles"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken est incompatible avec les commits ou assimilés"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr ""
+"l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
msgid "%s...%s: no merge base"
msgstr "%s..%s: pas de base de fusion"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git"
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "impossible de lire le fichier symlink %s"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "impossible de lire l'objet %s pour le symlink %s"
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr "échec : %d"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr "outil"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
"de sortie non-nul"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "passé à `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool exige un arbre de travail ou --no-index"
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff est incompatible avec --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"
"tags ne soit spécifié."
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "le jeton --anonymize-map ne peut pas être vide"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"sélectionner la gestion des messages de validation dans un encodage "
"alternatif"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "importer les marques depuis ce fichier s'il existe"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "depuis:vers"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"référencer les parents qui ne sont pas dans le flux d'export rapide par id "
"d'objet"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "afficher les ids d'objet originaux des blobs/commits"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "marquer les étiquettes avec des ids de marque"
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map n'a aucune signification sans --anonymize"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Champs from manquants pour le sous-module '%s'"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Champs 'to' manquants pour le sous-module '%s'"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Commande 'mark' attendue, %s trouvé"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Commande 'to' attendue, %s trouvé"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
"Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-"
"module"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
msgid "Lockfile created but not reported: %s"
msgstr "Fichier verrou créé mais non reporté : %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel ne peut pas être négatif"
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "définir la branche amont pour git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr "utiliser une transaction atomique pour mettre à jour les références"
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"modifier le spécificateur de référence pour placer les références dans refs/"
"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
"dépôt distant"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
"encombrent les étiquettes modifiées"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "écrire les références récupérées dans le fichier FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des "
"sommets de négociation"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "lancer 'maintenance --auto' après la récupération"
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
"vérifier les mises à jour forcées (forced-updates) sur toutes les branches "
"mises à jour"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "écrire le graphe de commits après le rapatriement"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "lire les spécificateurs de référence depuis l'entrée standard"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr "[rejeté]"
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr "extrait dans un autre arbre de travail"
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
+"fetch indique normalement quelles branches ont subi une mise à jour forcée,\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:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n"
+"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées ;\n"
"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
-"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
+"'git config fetch.showForcedUpdates false' pour éviter cette vérification\n"
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
"permises"
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\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"
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'"
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, c-format
-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"
+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"
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "L'option \"%s\" est ignorée pour %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "l'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr "l'objet %s n'existe pas"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "branches multiples détectées, imcompatible avec --set-upstream"
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne "
+"pointe sur aucune branche."
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "dépôt amont non défini pour la branche de suivi à distance"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr "dépôt amont non défini pour l'étiquette distante"
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr "type de branche inconnu"
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
"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:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
-msgstr "Impossible de récupérer %s"
+msgid "could not fetch %s"
+msgstr "impossible de récupérer %s"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "impossible de récupérer '%s' (code de sortie : %d)\n"
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
"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:1945
-msgid "You need to specify a tag name."
-msgstr "Vous devez spécifier un nom d'étiquette."
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
+msgstr "Vous devez spécifier un nom d'étiquette"
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Une profondeur négative dans --deepen n'est pas supportée"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
+msgstr "une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen et --depth sont mutuellement exclusifs"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
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"
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Distant ou groupe distant inexistant : %s"
+msgid "no such remote or remote group: %s"
+msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
msgstr ""
-"La récupération d'un groupe et les spécifications de référence n'ont pas de "
+"la récupération d'un groupe avec des spécifications de référence n'a pas de "
"sens"
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon."
-
#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon"
+
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
"extensions.partialclone"
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
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"
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
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 ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "utiliser <nom> au lieu de la branche cible reélle"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "fichier d'où lire"
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "échapper les champs réservés pour perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "échapper les champs réservés pour python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "échapper les champs réservés pour compatibilité avec Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "afficher seulement les références pointant sur l'objet"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "afficher seulement les références qui sont fusionnées"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "afficher seulement les références qui ne sont pas fusionnées"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "afficher seulement les références qui ne contiennent pas le commit"
msgid "%s: object is of unknown type '%s': %s"
msgstr "%s : l'objet a un type '%s' inconnu : %s"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s : impossible d'analyser : %s"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "mauvais fichier de sha1 : %s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Vérification du répertoire d'objet"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Vérification du lien %s"
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pointe sur quelque chose bizarre (%s)"
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s : la HEAD détachée ne pointe sur rien"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "note : %s pointe sur une branche non-née (%s)"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Vérification de l'arbre cache"
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "non-arbre dans l'arbre de cache"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s : objet manquant"
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
msgid "failed to parse '%s' value '%s'"
msgstr "échec de l'analyse de '%s' valeur '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "impossible d'analyser gc.logexpiry %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
"supprimer."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule n'est pas accepté"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argument de --schedule non reconnu, '%s'"
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "échec de l'écriture du graphe de commits"
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "échec de la pré-récupération des distants"
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr "impossible de démarrer le processus 'git pack-objects'"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr "impossible de finir le processus 'git pack-objects'"
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "échec de l'écriture de l'index de multi-paquet"
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "échec de 'git multi-pack-index expire'"
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "échec de 'git multi-pack-index repack'"
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "le fichier verrou '%s' existe, pas de maintenance"
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "échec de la tâche '%s'"
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' n'est pas une tâche valide"
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois"
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "lancer les tâches selon l'état du dépôt"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "fréquence"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "lancer les tâches selon une fréquence"
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "ne pas afficher le progrès ou d'autres informations sur stderr"
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr "tâche"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "lancer une tâche spécifique"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "échec du lancement de 'git config'"
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "impossible d'étendre le chemin '%s'"
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "échec de démarrage de launchctl"
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "échec de la création des répertoires pour '%s'"
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "échec de l'amorçage du service %s"
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "échec de création du fichier temporaire xml"
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "échec du démarrage de schtasks"
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
"'cron'"
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
"'cron'"
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "échec à l'ouverture de stdin de 'crontab'"
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' est mort"
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr "échec du démarrage de systemctl"
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr "échec pour lancer systemctl"
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr "échec de la suppression de '%s'"
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr "argument '%s' de --scheduler non reconnu"
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr "ni les minuteurs systemd ni crontab ne sont disponibles"
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr "le planificateur %s n'est pas disponible"
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr ""
"un autre processus est en train de programmer une maintenance en tâche de "
"fond"
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr "git maintenance start [--scheduler=<planificateur>]"
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr "planificateur"
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr "planificateur qui lancera les maintenances git"
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "échec de l'ajout du dépôt à la config globale"
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcommand> [<options>]"
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "sous-commande invalide : %s"
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "Échec de démarrage d'emacsclient."
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "Échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mauvais chaîne alias.%s : %s"
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
-msgstr "Cette option n'accepte pas d'autre argument"
+msgstr "cette option n'accepte pas d'autre argument"
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "'git help config' pour plus d'information"
msgid "unknown hash algorithm '%s'"
msgstr "algorithme d'empreinte inconnu '%s'"
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format ne peut pas être utilisé avec --stdin"
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
msgid "specify the hash algorithm to use"
msgstr "spécifier l'algorithme d'empreinte à utiliser"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgstr ""
"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "impossible de lire l'objet %s"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "type inconnu : %d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s : couverture invalide pour le mode de description"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "exactement une plage nécessaire"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "ceci n'est pas une plage"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "la lettre de motivation doit être au format courriel"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "échec de création du fichier de lettre de motivation"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "deux répertoires de sortie ?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "commit inconnu %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "échec à résoudre '%s' comme une référence valide"
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement"
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "échec à trouver la base de fusion exacte"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr ""
"échec d'inférence de l'origine de différence d'intervalles de la série "
"actuelle"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
"utilisation de '%s' comme une différence d'intervalle pour la série actuelle"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr "reroll-count"
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "taille maximum du nom du fichier de sortie"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"générer des parties de la lettre d'introduction à partir de la description "
"de la branche"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr ""
"afficher la barre de progression durant la phase de génération des patchs"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <rév> dans la première page ou une "
"rustine"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <refspec> dans la première page ou "
"une rustine"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "pourcentage par lequel la création est pondérée"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "Interdiff :"
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contre v%d :"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requiert --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "Diff-intervalle :"
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "Diff-intervalle contre v%d :"
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "Génération des patchs"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "échec de création des fichiers en sortie"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr "séparer les chemins par un caractère NUL"
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr "lire les motifs d'exclusion depuis <fichier>"
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "afficher les données de débogage"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "supprimer les entrées dupliquées"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr "utiliser une fusion basée sur diff3"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "utiliser une fusion basée sur un diff3 zélée"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "pour les conflits, utiliser notre version (our)"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "pour les conflits, utiliser leur version (their)"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "pour les conflits, utiliser l'ensemble des versions"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "pour les conflits, utiliser cette taille de marqueur"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "ne pas avertir à propos des conflits"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "utiliser <nom> au lieu de la cible réelle"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Déjà à jour. (rien à compresser)"
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr "option de stratégie inconnue : -X%s"
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"branche de sujet.\n"
"\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Un message vide abandonne la validation.\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "--quit n'accepte pas d'argument"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Possible de fusionner exactement une seule validation dans une tête vide"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide"
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
msgid "refs snapshot for selecting bitmap commits"
msgstr "instantané des réfs pour sélectionner les commits de bitmap"
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr ""
"afficher seulement les noms basés sur des références (pas de nom d'objet)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr "ignorer les références correspondant à <motif>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
msgid "Write/edit the notes for the following object:"
msgstr "Écrire/éditer les notes pour l'objet suivant :"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "impossible de démarrer 'show' pour l'objet '%s'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "impossible de lire la sortie de 'show'"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "impossible d'écrire l'objet note"
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr "trop d'arguments"
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"validez le résultat avec 'git notes merges --commit', ou abandonnez la "
"fusion avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg"
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "remiser et réappliquer automatiquement avant et après"
msgstr "<distant>"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "<branche>"
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n"
"remplacer à l'invocation la valeur par défaut configurée.\n"
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr "Impossible d'aller en avance rapide sur de multiples branches."
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr "Besoin de spécifier comment réconcilier des branches divergentes."
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "dépôt"
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete est incompatible avec --all, --mirror et --tags"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
"\n"
" git push <nom>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all et --tags sont incompatibles"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror et --tags sont incompatibles"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all et --mirror sont incompatibles"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr ""
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "--preserve-merges a été remplacé par --rebase-merges"
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "impossible de combiner '--keep-base' avec '--onto'"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "impossible de combiner '--keep-base' avec '--root'"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "impossible de combiner '--root' avec '--fork-point'"
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
msgstr "--strategy requiert --merge ou --interactive"
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
msgstr ""
-"impossible de combiner les options d'application avec les options de fusion"
+"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble"
#: builtin/rebase.c:1476
#, c-format
msgstr "pas de branche ou commit '%s'"
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Vous devez spécifier un répertoire."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "Vous devez spécifier un répertoire"
#: builtin/reflog.c:17
msgid ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists <référence>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "Marquage des objets inaccessibles..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "%s ne pointe nulle part !"
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "pas de journal de références à supprimer spécifié"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "'%s' n'est pas un journal de références"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "pas de journal de références pour '%s'"
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "format de référence invalide : %s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
msgid "Updating %s"
msgstr "Mise à jour de %s"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Impossible de récupérer %s"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
-msgstr "* distante %s"
+msgstr "* distant %s"
#: builtin/remote.c:1244
#, c-format
msgstr ""
"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
"les objects de paquet."
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"impossible de terminer pack-objects pour ré-empaqueter les objets de "
"prometteur"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "impossible d'ouvrir l'index pour %s"
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
"le paquet %s est trop gros pour être pris en compte dans un progression "
"géométrique"
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "le paquet %s est trop gros à enrouler"
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "impossible d'ouvrir le fichier temporaire %s en écriture"
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr "impossible de fermer le fichier temporaire d'instantané des réfs"
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git-update-server-info"
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "trouver une progression géométrique avec un facteur <N>"
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr "écrire un index de multi-paquet des paquets résultants"
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable et -A sont incompatibles"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric est incompatible avec -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "Rien de neuf à empaqueter."
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "fichier nécessaire manquant : %s"
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "impossible de délier : '%s'"
msgid "unable to open %s for reading"
msgstr "impossible d'ouvrir %s en écriture"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "impossible de lire depui mktree"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree a échoué"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree n'a pas retourné de nom d'objet"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "fstat de %s impossible"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "impossible d'écrire l'objet dans la base de données"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "nom d'objet invalide : '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "impossible d'obtenir le type de l'objet pour %s"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "échec de l'édition du fichier d'objet"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "le nouvel objet est identique à l'ancien : '%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "impossible d'analyser %s comme commit"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "étiquette de fusion malformée dans le commit '%s'"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
"utilisez --edit au lieu de --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "le commit original '%s' contient une signature GPG"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "la signature sera éliminée dans la validation de remplacement !"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "impossible d'écrire le commit de remplacement pour '%s'"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "graft pour '%s' non nécessaire"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "le nouveau commit est identique à l'ancien : '%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"impossible de convertir la(les) greffe(s) suivante(s) :\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "éditer l'objet existant"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "modifier les parents d'un commit"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "convertir le fichier de greffe existant"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "afficher sans mise en forme pour --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "utiliser ce format"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format ne peut pas être utilisé sans lister"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f n'a de sens qu'en écrivant un remplacement"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw n'a de sens qu'avec l'option --edit"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d requiert au moins un argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "mauvais nombre d'arguments"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e requiert un seul argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g requiert au moins un argument"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file ne supporte aucun argument"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "-l n'accepte qu'un motifs"
msgid "unable to generate diff for '%s'"
msgstr "échec de la génération de diff pour '%s'"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr ""
"git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "mixed"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "soft"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "hard"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "merge"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr ""
"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
"tard"
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Échec de résolution de '%s' comme une révision valide."
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Échec de résolution de '%s' comme un arbre valide."
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N ne peut être utilisé qu'avec --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"de\n"
"config reset.quiet à true pour avoir ce comportement en permanence.\n"
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "le filtrage d'objet exige --objects"
msgstr "rev-list ne supporte l'affichage des notes"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "le comptage marqué est incompatible avec --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "le comptage marqué et '%s' ne peuvent pas être utilisés ensemble"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog est incompatible avec --all, --remotes, --independent et --merge-"
-"base"
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
msgid "no such ref %s"
msgstr "référence inexistante %s"
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "impossible de gérer plus de %d révision."
msgstr[1] "impossible de gérer plus de %d révisions."
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' n'est pas une référence valide."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossible de trouver le commit %s (%s)"
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "cet arbre de travail n'est pas clairsemé"
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
"pourrait ne pas exister)"
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le "
"cone d'extraction clairsemée"
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr "échec de suppression du répertoire '%s'"
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"échec de la création du répertoire pour le fichier d'extraction clairsemée"
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr "échec de paramétrage extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "impossible de modifier la configuration d'index clairsemé"
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr "initialiser l'extraction clairsemée en mode cone"
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr "bascule l'utilisation d'index clairsemé"
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "impossible de modifier la configuration d'index clairsemé"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr "impossible de normaliser le chemin '%s'"
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "impossible de décoter la chaîne en style C '%s'"
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"les motifs de l'extraction clairsemée existants n'utilisent pas le mode cone"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <motifs>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
msgid "read patterns from standard in"
msgstr "lire les motifs depuis l'entrée standard"
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "aucun sparse-checkout auquel on peut ajouter"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<motifs>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"extraction clairsemée nécessaire pour pouvoir réappliquer les motifs de "
+"clairsemage"
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr "erreur lors du rafraîchissement du répertoire de travail"
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
" [--] [<spécificateur-de-chemin>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
#: builtin/stash.c:55
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "tentative de recréer l'index"
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s supprimé (%s)"
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s : Impossible de supprimer l'élément de stash"
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' n'est pas une référence de remisage"
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr ""
"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "échec de l'analyse de l'arbre"
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "échec du dépaquetage des arbres"
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "inclure les fichiers non suivis dans le remisage"
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "ne montrer que les fichiers non suivis dans le remisage"
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" exige un argument <commit>"
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Aucune modification indexée"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Impossible de sauver l'état actuel de l'index"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Impossible d'utiliser --staged et --include-untracked ou --all en même temps"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "Vous avez sûrement oublié 'git add' ?"
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "remiser seulement les modifications indexées"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "inclure les fichiers non suivis dans la remise"
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
"son propre amont d'autorité."
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
msgid "failed to recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "supprimer la sortie d'état du sous-module"
msgid "could not fetch a revision for HEAD"
msgstr "impossible de récupérer une révision pour HEAD"
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached et --files sont mutuellement exclusifs"
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez "
-"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
-"historique)"
+"L'arbre de travail du sous-module '%s' contient un répertoire .git. Il sera "
+"remplacé par un fichier .git en utilisant absorbgitdirs."
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
"utilisez '-f' pour les annuler"
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Répertoire '%s' nettoyé\n"
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "impossible de créer le répertoire vide du sous-module %s"
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
"modifications locales"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "désenregistrer tous les sous-modules"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
"clonez avec '--reference-if-able' au lieu de '--reference'."
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module"
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr "le répertoire n'est pas vide : '%s'"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
-msgstr "URL depuis laquelle cloner le sous-module"
+msgstr "url depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "interdire de cloner dans un répertoire non-vide"
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
"--path <chemin>"
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "Impossible d'extraire '%s' dans le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "Impossible de rebaser '%s' dans le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "Impossible de fusionner '%s' dans le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "L'exécution de '%s %s' a échoué dans le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "Chemin de sous-module '%s' : '%s' extrait\n"
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "Chemin de sous-module '%s' : rebasé dans '%s'\n"
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "Chemin de sous-module '%s' : fusionné dans '%s'\n"
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
"Impossible de rapatrier dans le chemin de sous-module '%s' ; essai de "
"rapatriement direct de %s :"
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"Chemin de sous-module '%s' récupéré, mais il ne contenait pas %s. La "
"récupération directe de ce commit a échoué."
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr ""
"supprimer la sortie lors de la mise à jour par un rebasage ou une fusion"
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr "forcer les mises à jour d'extraction"
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr "ne pas récupérer les nouveaux objets depuis le site distant"
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr ""
"passer outre le mode mise à jour dans le cas où le dépôt est un clone nouveau"
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr "profondeur pour une récupération superficielle"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr "sha1"
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr "SHA1 attendu par le super-projet"
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr "sous-sha1"
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr "SHA1 de la HEAD du sous-module"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr "git submodule--helper run-update-procedure [<options>] <chemin>"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"La branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr "vérifier si écrire dans le fichier .gitmodules est sur"
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr "désactiver la configuration dans le fichier .gitmodules"
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config name [<valeur>]"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nom>"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module"
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "régler la branche de suivi par défaut à master"
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "régler la branche de suivi par défaut"
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> "
"<chemin>"
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "--branch ou --default requis"
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch et --default sont mutuellement exclusifs"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Ajout du dépôt existant à '%s' dans l'index\n"
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' existe déjà et n'est pas un dépôt git valide"
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
"Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) "
"distant(s) :\n"
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"correct\n"
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Impossible d'extraire le sous-module '%s'"
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "Échec d'ajout du sous-module '%s'"
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "Échec d'enregistrement du sous-module '%s'"
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr "'%s' existe déjà dans l'index"
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "'%s' existe déjà dans l'index et n'est pas un sous-module"
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr "la branche du dépôt à ajouter comme sous-module"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr "afficher seulement les messages d'erreur"
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr "emprunter les objets depuis des dépôts de références"
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
"configurer le nom du sous-module avec la chaîne fournie au lieu d'utiliser "
"par défaut son chemin"
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]"
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../"
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' n'est pas un nom valide de sous-module"
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column et -n sont incompatibles"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "l'option -n est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "l'option --contains est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "l'option --no-contains est autorisée seulement en mode liste"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "l'option --points-at est autorisée seulement en mode liste"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "une seule option -F ou -m est autorisée."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "l'option '%s' est autorisée seulement en mode de liste"
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
msgid "initializing"
msgstr "initialisation"
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
"précédemment sur %s)"
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr "régler le mode de suivi (voir git-branch(1))"
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "essayer de nommer la nouvelle branche comme la branche amont"
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B et --detach sont mutuellement exclusifs"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason exige --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr "ajouté avec --lock"
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr "afficher les annotations étendues et les raisons, si disponible"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose et --porcelain sont mutuellement exclusifs"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"les arbres de travail contenant des sous-modules ne peuvent pas être "
"déplacés ou supprimés"
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr ""
"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossible de trouver le nom de la destination à partir de '%s'"
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"impossible de déplacer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "échec au déplacement de '%s' vers '%s'"
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "échec du lancement de 'git status' sur '%s'"
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le "
"supprimer"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "impossible de lancer 'git status' sur '%s', code %d"
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"impossible de supprimer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
"la validation a échoué, impossible de supprimer l'arbre de travail : %s"
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr "réparation : %s : '%s'"
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr "erreur : %s : %s"
"pour en lire plus à propos d'une commande spécifique ou d'un concept.\n"
"Voir 'git help git' pour un survol du système."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "aucun répertoire fourni pour --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "aucun répertoire fourni pour l'option '%s'\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "aucun espace de nom fournit pour --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "aucun répertoire fourni pour --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr "aucune clé de configuration fournie pour --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "aucun répertoire fourni pour -C\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr "alias recursif : %s"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "échec d'écriture sur la sortie standard"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "échec inconnu d'écriture sur la sortie standard"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "échec de fermeture de la sortie standard"
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s"
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "impossible d'utiliser %s comme une fonction intégrée"
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"usage : %s\n"
"\n"
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "échec au lancement de la commande '%s' : %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "pas un dépôt git"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile nécessite --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "options non gérées"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl : commande inconnue '%s' depuis git"
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "aucune information de compilateur disponible\n"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "répertoire de travail nécessaire"
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "aucune information de libc disponible\n"
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "impossible de trouver la racine d'enrôlement"
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr "args"
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "impossible de basculer vers '%s'"
-#: list-objects-filter-options.h:95
-msgid "object filtering"
-msgstr "filtrage d'objet"
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "impossible de configurer %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "impossible de configurer log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Les enrôlements scalaires requièrent un arbre de travail"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "la HEAD distante n'est pas une branche : '%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"échec de récupération de la branche par défaut depuis le distant ; "
+"utilisation de la valeur par défaut locale"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "échec de l'obtention du nom de branche par défaut"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "échec du désenregistrement du dépôt"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "échec de la suppression du répertoire d'enrôlement"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "branche à extraire après le clonage"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "lors d'un clonage, créer un répertoire de travail complet"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "ne télécharger les méta-données que pour la branche qui sera extraite"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "le répertoire '%s' existe déjà"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "échec d'obtention de la branche par défaut pour '%s'"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "impossible de paramétrer le distant dans '%s'"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "impossible de configurer '%s'"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "échec du clonage partiel ; tentative de clonage complet"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "impossible de configurer pour le clonage complet"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` n'accepte pas d'argument"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrôlement>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigurer tous les enrôlements enregistrés"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scala reconfigure [--all|<enrôlement>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all ou <enrôlement>, mais pas les deux"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "dépôt git parti dans '%s'"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <tâche> [<enrôlement>]\n"
+"Tâches :\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "pas de tâche : '%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrôlement>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrôlement>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "refus de la suppression du répertoire de travail actuel"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "inclure la version Git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "inclure les options de construction de Git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <commande> [<options>]\n"
+"\n"
+"Commandes :\n"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "aucune information de compilateur disponible\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "aucune information de libc disponible\n"
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr "args"
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
+msgstr "filtrage d'objet"
#: parse-options.h:183
msgid "expiry-date"
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr "utiliser <n> chiffres pour afficher les noms des objets"
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr "lire les spécificateurs de fichier depuis fichier"
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un "
"caractère NUL"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr "clé"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
msgstr "Afficher les noms canoniques et les adresses courriel des contacts"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "S'assurer qu'un nom de référence est bien formé"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Basculer de branche ou restaurer la copie de travail"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Copier les fichiers depuis l'index dans la copie de travail"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "S'assurer qu'un nom de référence est bien formé"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Trouver les commits à appliquer en amont"
"Ajouter ou analyser l'information structurée dans les messages de validation"
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Le navigateur de dépôt Git"
-
-#: command-list.h:117
msgid "Show commit logs"
msgstr "Afficher l'historique des validations"
-#: command-list.h:118
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr ""
"Afficher l'information à propos des fichiers dans l'index ou l'arbre de "
"travail"
-#: command-list.h:119
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Lister les références dans un dépôt distant"
-#: command-list.h:120
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Afficher le contenu d'un objet arbre"
-#: command-list.h:121
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
"Extraire le patch et l'information de d'auteur depuis un simple message de "
"courriel"
-#: command-list.h:122
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Programme simple de découpage de mbox UNIX"
-#: command-list.h:123
+#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "Lancer les tâches pour optimiser les données du depôt Git"
-#: command-list.h:124
+#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
-#: command-list.h:125
+#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "Trouver un ancêtre aussi bon que possible pour une fusion"
-#: command-list.h:126
+#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "Lancer une fusion à 3 points"
-#: command-list.h:127
+#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner"
-#: command-list.h:128
+#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "Le programme assistant standard à utiliser avec git-merge-index"
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Afficher la fusion à trois points sans modifier l'index"
+
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
"conflits de fusion"
#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Afficher la fusion à trois points sans modifier l'index"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Écrire et vérifier les index multi-paquet"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Créer un objet étiquette avec validation supplémentaire"
-#: command-list.h:133
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree"
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Écrire et vérifier les index multi-paquet"
+
+#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"
-#: command-list.h:135
+#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "Trouver les noms symboliques pour des révisions données"
-#: command-list.h:136
+#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "Ajouter ou inspecter les notes d'un objet"
-#: command-list.h:137
+#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "Importer et soumettre à des dépôt Perforce"
-#: command-list.h:138
+#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "Créer une archive compactée d'objets"
-#: command-list.h:139
+#: command-list.h:138
msgid "Find redundant pack files"
msgstr "Trouver les fichiers pack redondants"
-#: command-list.h:140
+#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt"
-#: command-list.h:141
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Calculer l'ID unique d'un patch"
-#: command-list.h:142
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr ""
"Éliminer les objets inatteignables depuis la base de données des objets"
-#: command-list.h:143
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack"
-#: command-list.h:144
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"
-#: command-list.h:145
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "Mettre à jour les références distantes ainsi que les objets associés"
-#: command-list.h:146
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Appliquer un patchset quilt sur la branche courante"
-#: command-list.h:147
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
"Comparer deux plages de commits (par exemple deux versions d'une branche)"
-#: command-list.h:148
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Lire l'information d'arbre dans l'index"
-#: command-list.h:149
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Réapplication des commits sur le sommet de l'autre base"
-#: command-list.h:150
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Recevoir ce qui est poussé dans le dépôt"
-#: command-list.h:151
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Gérer l'information de reflog"
-#: command-list.h:152
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Gérer un ensemble de dépôts suivis"
-#: command-list.h:153
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Empaqueter les objets non-empaquetés d'un dépôt"
-#: command-list.h:154
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Créer, lister, supprimer des référence pour remplacer des objets"
-#: command-list.h:155
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Générer une résumé des modifications en attentes"
-#: command-list.h:156
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles"
-#: command-list.h:157
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Réinitialiser la HEAD courante à l'état spécifié"
-#: command-list.h:158
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Restaurer les fichiers l'arbre de travail"
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Inverser des commits existants"
-
-#: command-list.h:160
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
-#: command-list.h:161
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Analyser et préparer les paramètres"
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Inverser des commits existants"
+
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Supprimer des fichiers de la copie de travail et de l'index"
-#: command-list.h:163
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Envoyer un ensemble de patchs comme courriels"
-#: command-list.h:164
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Pousser les objets sur un autre dépôt via le protocole Git"
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Le code d'initialisation i18n pour les scripts shell"
+
#: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Le code d'initialisation commun aux scripts shell Git"
+
+#: command-list.h:166
msgid "Restricted login shell for Git-only SSH access"
msgstr "Shell de login restreint pour un accès SSH vers Git seulement"
-#: command-list.h:166
+#: command-list.h:167
msgid "Summarize 'git log' output"
msgstr "Résumer la sortie de 'git log'"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show various types of objects"
msgstr "Afficher différents types d'objets"
-#: command-list.h:168
+#: command-list.h:169
msgid "Show branches and their commits"
msgstr "Afficher les branches et leurs commits"
-#: command-list.h:169
+#: command-list.h:170
msgid "Show packed archive index"
msgstr "Afficher l'index de l'archive empaquetée"
-#: command-list.h:170
+#: command-list.h:171
msgid "List references in a local repository"
msgstr "Lister les références du dépôt local"
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Le code d'initialisation i18n pour les scripts shell"
-
#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Le code d'initialisation commun aux scripts shell Git"
-
-#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Initialiser et modifier l'extraction clairsemée"
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Ajouter le contenu de fichiers à l'index"
+
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Remiser les modifications d'un répertoire de travail sale"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Ajouter le contenu de fichiers à l'index"
-
-#: command-list.h:176
msgid "Show the working tree status"
msgstr "Afficher l'état de la copie de travail"
-#: command-list.h:177
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Retirer les espaces inutiles"
-#: command-list.h:178
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
-#: command-list.h:179
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git"
-#: command-list.h:180
+#: command-list.h:179
msgid "Switch branches"
msgstr "Basculer de branche"
-#: command-list.h:181
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Lire, modifier et supprimer les références symboliques"
-#: command-list.h:182
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
-#: command-list.h:183
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Créer un fichier temporaire avec le contenu d'un blob"
-#: command-list.h:184
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Dépaqueter les objets depuis une archive empaquetée"
-#: command-list.h:185
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"
-#: command-list.h:186
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr ""
"Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"
-#: command-list.h:187
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "
"idiots"
-#: command-list.h:188
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Renvoyer une archive dans git-archive"
-#: command-list.h:189
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"
-#: command-list.h:190
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Afficher un variable logique de Git"
-#: command-list.h:191
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Vérifier la signature GPG de commits"
-#: command-list.h:192
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Valider des fichiers d'archive Git empaquetés"
-#: command-list.h:193
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Vérifier la signature GPG d'étiquettes"
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interface web de Git"
-
-#: command-list.h:195
+#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr "Afficher les journaux avec la différence que chaque commit introduit"
-#: command-list.h:196
+#: command-list.h:194
msgid "Manage multiple working trees"
msgstr "Gérer des arbres de travail multiples"
-#: command-list.h:197
+#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr "Créer un objet arbre depuis l'index courant"
-#: command-list.h:198
+#: command-list.h:196
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: command-list.h:199
+#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr "Interface en ligne de commande et conventions de Git"
-#: command-list.h:200
+#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr "Tutoriel du cœur de Git pour les développeurs"
-#: command-list.h:201
+#: command-list.h:199
msgid "Providing usernames and passwords to Git"
msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git"
-#: command-list.h:202
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git pour les utilisateurs de CVS"
-#: command-list.h:203
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Bidouillage de la sortie diff"
-#: command-list.h:204
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"
-#: command-list.h:205
+#: command-list.h:203
msgid "Frequently asked questions about using Git"
msgstr "Foire aux questions sur l'utilisation de Git"
-#: command-list.h:206
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Un glossaire Git"
-#: command-list.h:207
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Crochets utilisés par Git"
-#: command-list.h:208
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Le navigateur de dépôt Git"
+
+#: command-list.h:208
msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
"Fait correspondre les noms d'auteur/validateur avec les adresses de courriel"
-#: command-list.h:210
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: command-list.h:211
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Espaces de nom de Git"
-#: command-list.h:212
+#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "Programmes assistants pour interagir avec des dépôts distants"
-#: command-list.h:213
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Disposition d'un dépôt Git"
-#: command-list.h:214
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: command-list.h:215
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Montage d'un dépôt dans un autre dépôt"
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Une introduction pratique à Git"
+
#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Une introduction pratique à Git : deuxième partie"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Une introduction pratique à Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interface web de Git"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgid "usage: $dashless $USAGE"
msgstr "usage : $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
"travail"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Impossible de réécrire les branches : vous avez des modifications non "
"indexées."
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action est impossible : vous avez des modifications non indexées."
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"$action est impossible : votre index contient des modifications non validées."
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr "De plus, votre index contient des modifications non validées."
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Vous devez lancer cette commande depuis la racine de votre copie de travail."
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
msgid "failed to open hunk edit file for reading: %s"
msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - indexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas indexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - remiser cette section et toutes les suivantes de ce fichier\n"
"d - ne pas remiser cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas désindexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas éliminer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "fichier non-fusionné ignoré : %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Aucune autre section à atteindre\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Nombre invalide : '%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Désolé, %d seule section disponible.\n"
msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Aucune autre section à rechercher\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regex de recherche malformée %s : %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Aucune section ne correspond au motif donné\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Pas de section précédente\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Pas de section suivante\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Désolé, impossible de découper cette section\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Découpée en %d section.\n"
msgstr[1] "Découpée en %d sections.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Désolé, impossible d'éditer cette section\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - visualiser les diff entre HEAD et l'index\n"
"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "-- manquant"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "mode de --patch inconnu : %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument invalide %s, -- attendu"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
"la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "fatal : la commande '%s' s'est interrompue avec le code %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'éditeur est sorti en erreur, abandon total"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' contient une version intermédiaire du courriel que vous composiez.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contient le courriel composé.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases est incompatible avec d'autres options\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette "
"vérification.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
"commande ou des options de configuration)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paramètre de --confirm inconnu : '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "attention : `:include:` n'est pas supporté : %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "attention : ligne sendmail non reconnue : %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
" * en fournissant l'option --format-patch pour une plage.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Échec à l'ouverture du répertoire %s : %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"Aucun fichier patch spécifié !\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Ligne de sujet non trouvée dans %s ?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Impossible d'ouvrir %s en écriture : %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Échec à l'ouverture de %s : %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Échec à l'ouverture de %s.final : %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Le courriel de résumé étant vide, il a été ignoré\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
"vraiment envoyer.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal : l'alias '%s' se développe en lui-même\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
"a) ? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Le chemin vers la CA \"%s\" n'existe pas"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Une réponse est nécessaire"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "échec de STARTTLS ! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
"debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Échec de l'envoi de %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Envoi simulé de %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "%s envoyé\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Simulation OK. Le journal indique :\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Le journal indique :\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Résultat : "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"fatal : %s : %d est plus long que 998 caractères \n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+
+#~ msgid "--index outside a repository"
+#~ msgstr "--index hors d'un dépôt"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached hors d'un dépôt"
+
+#~ msgid "unrecognized input"
+#~ msgstr "entrée non reconnue"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "impossible de lire %s"
+
+#~ msgid "Option --exec can only be used together with --remote"
+#~ msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
+
+#, c-format
+#~ msgid ""
+#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' de "
+#~ "'%s' en rebasant."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' "
+#~ "depuis '%s'."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
+#~ "rebasant."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s'."
+#~ msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
+#~ "rebasant."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s'."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
+
+#~ msgid "Cannot force update the current branch."
+#~ msgstr "Impossible de forcer la mise à jour de la branche courante."
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "Nom d'objet invalide : '%s'."
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr ""
+#~ "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr ""
+#~ "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-"
+#~ "regex avec -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"
+#~ "pickaxe-all avec -G et -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc nécessite multi_ack_detailed"
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only et --right-only sont mutuellement exclusifs"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "argument %%(objectsize) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "argument %%(subject) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "argument %%(contents) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "argument %%(raw) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "argument '%s' non reconnu dans %%(%s)"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "argument %%(align) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "argument %%(if) non reconnu : %s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input est incompatible avec --no-walk"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk est incompatible avec --unsorted-input"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run est incompatible avec --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file est incompatible avec --edit"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A et -u sont mutuellement incompatibles"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr ""
+#~ "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-"
+#~ "run"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
+
+#, c-format
+#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+#~ msgstr ""
+#~ "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column et --verbose sont incompatibles"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "'%s' ne peut pas être utilisé avec %s"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr ""
+#~ "paramétrer les coordonnées de branche amont pour une nouvelle branche"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p et --overlay sont mutuellement exclusifs"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file est incompatible avec --detach"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file est incompatible avec --patch"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "les options --bare et --origin %s sont incompatibles."
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "--bare et --separate-git-dir sont incompatibles."
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "impossible de combiner -m avec --fixup:%s"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long et -z sont incompatibles"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr ""
+#~ "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "l'option reword de --fixup est mutuellement exclusive avec --patch/--"
+#~ "interactive/--all/--include/--only"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long et --abbrev=0 sont incompatibles"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr ""
+#~ "--dirty est incompatible avec la spécification de commits ou assimilés"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken est incompatible avec les commits ou assimilés"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff est incompatible avec --no-index"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "--anonymize-map n'a aucune signification sans --anonymize"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr ""
+#~ "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
+
+#, c-format
+#~ msgid "Refusing to fetch into current branch %s of non-bare repository"
+#~ msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen et --depth sont mutuellement exclusifs"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format ne peut pas être utilisé avec --stdin"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n et -k sont mutuellement exclusifs"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr ""
+#~ "--stdout, --output, et --output-directory sont mutuellement exclusifs"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor requiert --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete est incompatible avec --all, --mirror et --tags"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all et --tags sont incompatibles"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror et --tags sont incompatibles"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all et --mirror sont incompatibles"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "impossible de combiner '--keep-base' avec '--onto'"
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "impossible de combiner '--keep-base' avec '--root'"
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "impossible de combiner '--root' avec '--fork-point'"
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr ""
+#~ "impossible de combiner les options d'application avec les options de "
+#~ "fusion"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable et -A sont incompatibles"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric est incompatible avec -A, -a"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch est incompatible avec --{hard,mixed,soft}"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N ne peut être utilisé qu'avec --mixed"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "impossible de combiner --exclude-promisor-objects et --missing"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "le comptage marqué est incompatible avec --objects"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr ""
+#~ "--reflog est incompatible avec --all, --remotes, --independent et --merge-"
+#~ "base"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached et --files sont mutuellement exclusifs"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch et --default sont mutuellement exclusifs"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column et -n sont incompatibles"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "l'option --contains est autorisée seulement en mode de liste"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "l'option --no-contains est autorisée seulement en mode liste"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "l'option --points-at est autorisée seulement en mode liste"
+
+#~ msgid "--merged and --no-merged options are only allowed in list mode"
+#~ msgstr ""
+#~ "les options --merged et --no-merged ne sont autorisées qu'en mode liste"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "une seule option -F ou -m est autorisée."
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B et --detach sont mutuellement exclusifs"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason exige --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose et --porcelain sont mutuellement exclusifs"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "aucun répertoire fourni pour --git-dir\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "aucun répertoire fourni pour --work-tree\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile nécessite --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Huh (%s)?"
msgstr ""
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr ""
msgid "could not stage '%s'"
msgstr ""
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr ""
msgid "note: %s is untracked now.\n"
msgstr ""
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
msgid "ignoring unmerged: %s"
msgstr ""
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr ""
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr ""
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr ""
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr ""
msgid "(empty) select nothing"
msgstr ""
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr ""
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr ""
msgid "unstaged"
msgstr ""
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr ""
msgid "could not refresh index"
msgstr ""
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr ""
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr ""
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr ""
msgid "No other hunks to goto"
msgstr ""
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr ""
msgid "No other hunks to search"
msgstr ""
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr ""
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr ""
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr ""
-
-#: apply.c:150
-msgid "--index outside a repository"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
msgstr ""
-#: apply.c:153
-msgid "--cached outside a repository"
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
msgstr ""
#: apply.c:800
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr ""
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr ""
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr ""
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr ""
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr ""
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4755
-msgid "unrecognized input"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
msgstr ""
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr ""
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr ""
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr ""
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr ""
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr ""
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr ""
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr ""
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr ""
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr ""
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr ""
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr ""
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr ""
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr ""
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr ""
msgstr ""
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr ""
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
msgstr ""
#: archive.c:582
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr ""
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "not setting branch '%s' as its own upstream"
msgstr ""
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "branch '%s' set up to track '%s' by rebasing."
msgstr ""
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgid "branch '%s' set up to track '%s'."
msgstr ""
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgid "branch '%s' set up to track:"
msgstr ""
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
msgstr ""
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+msgid "not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "'%s' is not a valid branch name"
msgstr ""
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
+msgid "a branch named '%s' already exists"
msgstr ""
-#: branch.c:208
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
+msgid "cannot force update the branch '%s'checked out at '%s'"
msgstr ""
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
msgstr ""
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
+msgid "not a valid object name: '%s'"
msgstr ""
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "ambiguous object name: '%s'"
msgstr ""
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
+msgid "not a valid branch point: '%s'"
msgstr ""
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr ""
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgid "final chunk has non-zero id %<PRIx32>"
msgstr ""
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr ""
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr ""
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "unable to fork"
msgstr ""
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr ""
"tree"
msgstr ""
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
msgstr ""
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
msgstr ""
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr ""
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr ""
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr ""
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr ""
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr ""
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr ""
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr ""
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr ""
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr ""
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr ""
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr ""
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr ""
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr ""
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr ""
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr ""
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr ""
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr ""
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr ""
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr ""
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr ""
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr ""
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr ""
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr ""
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr ""
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr ""
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr ""
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr ""
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr ""
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr ""
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr ""
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr ""
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr ""
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr ""
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr ""
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr ""
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr ""
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr ""
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr ""
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr ""
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr ""
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr ""
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr ""
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
msgstr ""
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
msgstr ""
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr ""
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr ""
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr ""
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr ""
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr ""
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr ""
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr ""
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr ""
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr ""
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
msgstr ""
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr ""
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr ""
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
+msgid "Run '%s' instead [y/N]? "
msgstr ""
#: help.c:654
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr ""
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
" %s"
msgstr ""
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr ""
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr ""
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr ""
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr ""
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr ""
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr ""
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr ""
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr ""
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr ""
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr ""
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr ""
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr ""
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr ""
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr ""
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr ""
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr ""
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr ""
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr ""
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr ""
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr ""
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr ""
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr ""
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr ""
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr ""
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr ""
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
msgid "could not write '%s' promisor file"
msgstr ""
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr ""
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr ""
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr ""
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr ""
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr ""
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr ""
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr ""
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr ""
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr ""
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr ""
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr ""
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
"\n"
msgstr ""
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr ""
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr ""
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr ""
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr ""
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
msgstr ""
#: ref-filter.c:912
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
msgid "invalid branch name: %s = %s"
msgstr ""
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr ""
msgid "invalid refspec '%s'"
msgstr ""
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr ""
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr ""
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr ""
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr ""
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr ""
msgid "could not determine HEAD revision"
msgstr ""
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr ""
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr ""
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr ""
"run \"git revert --abort\"."
msgstr ""
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr ""
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr ""
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr ""
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr ""
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr ""
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr ""
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr ""
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr ""
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr ""
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr ""
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] ""
msgstr[1] ""
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] ""
msgstr[1] ""
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr ""
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr ""
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr ""
msgid "process for submodule '%s' failed"
msgstr ""
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr ""
msgid "Aborting."
msgstr ""
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr ""
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%s"
msgstr ""
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"%s"
msgstr ""
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"%s"
msgstr ""
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr ""
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr ""
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr ""
msgid "Fetching objects"
msgstr ""
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr ""
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ""
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr ""
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr ""
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr ""
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr ""
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr ""
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr ""
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr ""
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr ""
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr ""
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr ""
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr ""
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr ""
msgid "untracked content, "
msgstr ""
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr ""
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr ""
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr ""
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr ""
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr ""
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr ""
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr ""
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr ""
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr ""
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr ""
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr ""
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""
msgstr ""
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr ""
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
msgstr ""
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""
msgstr ""
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr ""
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1129
+#: builtin/am.c:1159
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
msgstr ""
-#: builtin/am.c:1224
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+#: builtin/am.c:1161
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1252
-msgid "Patch is empty."
+#: builtin/am.c:1256
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr ""
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr ""
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr ""
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr ""
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr ""
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr ""
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr ""
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr ""
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr ""
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr ""
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr ""
msgid "show work cost statistics"
msgstr ""
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr ""
msgid "ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr ""
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr ""
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr ""
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr ""
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr ""
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr ""
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr ""
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr ""
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr ""
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
msgstr ""
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
msgstr ""
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr ""
msgid "could not lstat %s\n"
msgstr ""
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr ""
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr ""
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr ""
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr ""
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr ""
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr ""
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr ""
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr ""
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr ""
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr ""
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr ""
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
+msgid "options '%s' and '%s %s' cannot be used together"
msgstr ""
#: builtin/clone.c:920
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr ""
msgid "Collecting commits from input"
msgstr ""
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr ""
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr ""
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr ""
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr ""
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr ""
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
msgstr ""
#: builtin/commit.c:814 builtin/commit.c:830
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr ""
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
msgstr ""
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr ""
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr ""
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr ""
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr ""
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr ""
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr ""
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr ""
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr ""
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr ""
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr ""
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr ""
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr ""
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
msgstr ""
#: builtin/diff-tree.c:157
msgid "%s...%s: no merge base"
msgstr ""
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr ""
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr ""
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr ""
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr ""
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr ""
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr ""
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr ""
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr ""
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr ""
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr ""
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr ""
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr ""
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr ""
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
msgid "Lockfile created but not reported: %s"
msgstr ""
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr ""
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr ""
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr ""
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr ""
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr ""
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr ""
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr ""
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr ""
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr ""
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
msgstr ""
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr ""
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr ""
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr ""
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
+#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
msgstr ""
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr ""
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr ""
msgid "%s: object is of unknown type '%s': %s"
msgstr ""
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr ""
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr ""
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr ""
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr ""
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr ""
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr ""
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr ""
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr ""
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr ""
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr ""
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr ""
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr ""
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr ""
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr ""
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr ""
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr ""
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr ""
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr ""
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr ""
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr ""
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr ""
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr ""
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr ""
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr ""
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr ""
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr ""
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr ""
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr ""
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr ""
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr ""
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr ""
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr ""
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr ""
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr ""
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr ""
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr ""
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr ""
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr ""
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr ""
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr ""
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr ""
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr ""
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr ""
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr ""
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr ""
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr ""
msgid "unknown hash algorithm '%s'"
msgstr ""
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr ""
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr ""
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr ""
msgid "specify the hash algorithm to use"
msgstr ""
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr ""
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr ""
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr ""
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr ""
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr ""
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr ""
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr ""
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr ""
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr ""
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr ""
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr ""
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr ""
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr ""
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr ""
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr ""
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr ""
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr ""
#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
+msgid "use a zealous diff3 based merge"
msgstr ""
#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
+msgid "for conflicts, use our version"
msgstr ""
#: builtin/merge-file.c:41
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr ""
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr ""
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr ""
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr ""
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr ""
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr ""
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr ""
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr ""
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr ""
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr ""
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr ""
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr ""
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr ""
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr ""
msgid "refs snapshot for selecting bitmap commits"
msgstr ""
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr ""
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr ""
msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr ""
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr ""
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr ""
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr ""
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr ""
msgstr ""
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr ""
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"invocation.\n"
msgstr ""
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr ""
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr ""
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr ""
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr ""
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr ""
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr ""
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr ""
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr ""
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr ""
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr ""
msgstr ""
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
msgstr ""
#: builtin/rebase.c:1476
msgstr ""
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr ""
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
msgstr ""
#: builtin/reflog.c:17
msgid "git reflog exists <ref>"
msgstr ""
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr ""
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr ""
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr ""
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr ""
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr ""
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr ""
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
msgid "Updating %s"
msgstr ""
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr ""
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr ""
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr ""
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr ""
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr ""
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr ""
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr ""
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr ""
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr ""
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr ""
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr ""
msgid "unable to generate diff for '%s'"
msgstr ""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr ""
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr ""
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr ""
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr ""
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr ""
msgstr ""
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
msgstr ""
#: builtin/rev-parse.c:409
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr ""
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
msgid "git sparse-checkout list"
msgstr ""
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr ""
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"cone"
msgstr ""
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr ""
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr ""
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:667
-msgid "read patterns from standard in"
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
msgstr ""
#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr ""
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr ""
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
msgid "Index was not unstashed."
msgstr ""
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr ""
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr ""
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr ""
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr ""
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr ""
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr ""
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr ""
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr ""
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr ""
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr ""
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr ""
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr ""
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr ""
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr ""
msgid "could not fetch a revision for HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr ""
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"of that commit failed."
msgstr ""
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr ""
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr ""
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr ""
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr ""
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr ""
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr ""
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr ""
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr ""
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr ""
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr ""
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr ""
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr ""
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr ""
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr ""
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr ""
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr ""
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr ""
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr ""
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr ""
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr ""
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr ""
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr ""
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr ""
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr ""
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr ""
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
"want to.\n"
msgstr ""
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr ""
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid "initializing"
msgstr ""
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr ""
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr ""
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr ""
"See 'git help git' for an overview of the system."
msgstr ""
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
+msgid "no directory given for '%s' option\n"
msgstr ""
#: git.c:202
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr ""
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr ""
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr ""
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr ""
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr ""
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr ""
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr ""
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr ""
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr ""
msgstr ""
#: command-list.h:65
-msgid "Switch branches or restore working tree files"
+msgid "Ensures that a reference name is well formed"
msgstr ""
#: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
msgstr ""
#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:68
msgstr ""
#: command-list.h:116
-msgid "The Git repository browser"
+msgid "Show commit logs"
msgstr ""
#: command-list.h:117
-msgid "Show commit logs"
+msgid "Show information about files in the index and the working tree"
msgstr ""
#: command-list.h:118
-msgid "Show information about files in the index and the working tree"
+msgid "List references in a remote repository"
msgstr ""
#: command-list.h:119
-msgid "List references in a remote repository"
+msgid "List the contents of a tree object"
msgstr ""
#: command-list.h:120
-msgid "List the contents of a tree object"
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
+msgid "Run tasks to optimize Git repository data"
msgstr ""
#: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
+msgid "Join two or more development histories together"
msgstr ""
#: command-list.h:124
-msgid "Join two or more development histories together"
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
#: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Run a three-way file merge"
msgstr ""
#: command-list.h:126
-msgid "Run a three-way file merge"
+msgid "Run a merge for files needing merging"
msgstr ""
#: command-list.h:127
-msgid "Run a merge for files needing merging"
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
+msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:129
msgstr ""
#: command-list.h:130
-msgid "Show three-way merge without touching index"
+msgid "Creates a tag object with extra validation"
msgstr ""
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:132
-msgid "Creates a tag object with extra validation"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:135
-msgid "Find symbolic names for given revs"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:136
-msgid "Add or inspect object notes"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:138
-msgid "Create a packed archive of objects"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:139
-msgid "Find redundant pack files"
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
+msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:141
-msgid "Compute unique ID for a patch"
+msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
+msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:145
-msgid "Update remote refs along with associated objects"
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:148
-msgid "Reads tree information into the index"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:149
-msgid "Reapply commits on top of another base tip"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:150
-msgid "Receive what is pushed into the repository"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:151
-msgid "Manage reflog information"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:152
-msgid "Manage set of tracked repositories"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:153
-msgid "Pack unpacked objects in a repository"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:155
-msgid "Generates a summary of pending changes"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:157
-msgid "Reset current HEAD to the specified state"
+msgid "Restore working tree files"
msgstr ""
#: command-list.h:158
-msgid "Restore working tree files"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:159
-msgid "Revert some existing commits"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:161
-msgid "Pick out and massage parameters"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:162
-msgid "Remove files from the working tree and from the index"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:163
-msgid "Send a collection of patches as emails"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:166
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:167
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:168
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:169
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:170
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:172
-msgid "Common Git shell script setup code"
+msgid "Initialize and modify the sparse-checkout"
msgstr ""
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:174
msgstr ""
#: command-list.h:175
-msgid "Add file contents to the staging area"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:176
-msgid "Show the working tree status"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:177
-msgid "Remove unnecessary whitespace"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:178
-msgid "Initialize, update or inspect submodules"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Switch branches"
msgstr ""
#: command-list.h:180
-msgid "Switch branches"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:184
-msgid "Unpack objects from a packed archive"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:185
-msgid "Register file contents in the working tree to the index"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:186
-msgid "Update the object name stored in a ref safely"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:188
-msgid "Send archive back to git-archive"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:190
-msgid "Show a Git logical variable"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:191
-msgid "Check the GPG signature of commits"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:192
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:193
-msgid "Check the GPG signature of tags"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:195
-msgid "Show logs with difference each commit introduces"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:196
-msgid "Manage multiple working trees"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:197
-msgid "Create a tree object from the current index"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:198
-msgid "Defining attributes per path"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:199
-msgid "Git command-line interface and conventions"
+msgid "Providing usernames and passwords to Git"
msgstr ""
#: command-list.h:200
-msgid "A Git core tutorial for developers"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:201
-msgid "Providing usernames and passwords to Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:202
-msgid "Git for CVS users"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:203
-msgid "Tweaking diff output"
+msgid "Frequently asked questions about using Git"
msgstr ""
#: command-list.h:204
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:205
-msgid "Frequently asked questions about using Git"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:206
-msgid "A Git Glossary"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:207
-msgid "Hooks used by Git"
+msgid "The Git repository browser"
msgstr ""
#: command-list.h:208
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
#: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:210
-msgid "Defining submodule properties"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:211
-msgid "Git namespaces"
+msgid "Helper programs to interact with remote repositories"
msgstr ""
#: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:213
-msgid "Git Repository Layout"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
+msgid "Mounting one repository inside another"
msgstr ""
#: command-list.h:215
-msgid "Mounting one repository inside another"
+msgid "A tutorial introduction to Git"
msgstr ""
#: command-list.h:216
msgstr ""
#: command-list.h:217
-msgid "A tutorial introduction to Git"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:218
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr ""
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr ""
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
"PO-Revision-Date: 2021-08-14 09:35+0700\n"
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
"Language-Team: Indonesian\n"
msgid "Huh (%s)?"
msgstr "Huh (%s)"
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "tidak dapat membaca indeks"
msgid "could not stage '%s'"
msgstr "tidak dapat menggelar '%s'"
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "tidak dapat menulis indeks"
msgid "note: %s is untracked now.\n"
msgstr "catatan: %s sekarang tak terlacak.\n"
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gagal untuk jalur '%s'"
msgid "ignoring unmerged: %s"
msgstr "mengabaikan tak tergabung: %s"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Hanya berkas biner yang berubah.\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Tidak ada perubahan.\n"
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Pembaruan tambalan"
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Tinjau diff"
msgid "(empty) select nothing"
msgstr "(empty) tidak pilih apapun"
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Perintah ***"
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Apa sekarang"
msgid "unstaged"
msgstr "tak tergelar"
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "jalur"
msgid "could not refresh index"
msgstr "tidak dapat menyegarkan indeks"
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Sampai jumpa.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Gelar penambahan [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "
"a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
"d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stase penghapusan [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Stase penambahan [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "
"a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
"d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "
"a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
"d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? "
"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? "
"a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n"
"d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
"a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
"d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Tetap terapkan itu ke pohon kerja? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Tidak ada yang diterapkan.\n"
msgid "No other hunks to goto"
msgstr "Tidak ada bingkah lainnya untuk dikunjungi"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "pergi ke bingkah yang mana?"
msgid "No other hunks to search"
msgstr "Tidak ada bingkah lainnya untuk dicari"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "cari untuk regex? "
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opsi abai spasi putih tidak dikenal '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject dan --3way tidak dapat digunakan bersamaan."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way di luar repositori"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index di luar repositori"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached di luar repositori"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' di luar repositori"
#: apply.c:800
#, c-format
msgid "cannot checkout %s"
msgstr "tidak dapat men-checkout %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "gagal membaca %s"
msgid "reading from '%s' beyond a symbolic link"
msgstr "membaca dari '%s' diluar tautan simbolik"
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "jalus %s sudah dinamai ulang/dihapus"
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: tidak ada di indeks"
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "%s: tidak cocok dengan indeks"
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 "
"arah."
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Melakukan penggabungan 3 arah...\n"
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "tidak dapat membaca konten saat ini dari '%s'"
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Gagal melakukan penggabungan 3 arah...\n"
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Mundur ke penerapan langsung...\n"
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "tambalan penghapusan meninggalkan isi berkas"
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "%s: salah tipe"
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s bertipe %o, diharapkan %o"
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "jalur tidak valid '%s'"
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "%s: sudah ada di indeks"
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: sudah ada di direktori kerja"
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: tambalan tak diterapkan"
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "Memeriksa tambalan %s..."
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "informasi sha1 kurang atau tidak berguna (%s)"
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "tidak dapat menambahkan %s ke indeks sementara"
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "tidak dapat menulis indeks sementara ke %s"
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "tidak dapat menghapus %s dari indeks"
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "tambalan rusak untuk submodul %s"
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"tidak dapat membuat simpanan pendukung untuk berkas yang baru dibuat %s"
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "tidak dapat menambahkan entri tembolok untuk %s"
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "gagal menulis ke '%s'"
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "menutup berkas '%s'"
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "tidak dapat menulis berkas '%s' mode %o"
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tambalan %s diterapkan dengan rapi."
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr "kesalahan internal"
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..."
msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..."
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "memotong nama berkas .rej ke %.*s.rej"
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "tidak dapat membuka %s"
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Bingkah #%d diterapkan dengan rapi."
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "Bingkah #%d ditolak."
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "Tambalan '%s' dilewatkan."
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "masukan tidak dikenal"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr "tidak dapa membaca berkas indeks"
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "tidak dapat membuka tambalan '%s': %s"
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d kesalahan spasi putih dipadamkan"
msgstr[1] "%d kesalahan spasi putih dipadamkan"
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d baris menambahkan kesalahan spasi putih."
msgstr[1] "%d baris menambahkan kesalahan spasi putih."
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Tidak dapat menulis berkas indeks baru"
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "jumlah"
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "abaikan penambahan yang dibuat oleh tambalan"
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal"
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "tandai berkas baru dengan `git add --intent-to-add`"
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal"
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "jalur dipisahkan dengan karakter NUL"
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "pastikan setidaknya <n> baris dari konteks cocokan"
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr "aksi"
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr "abaikan perubahan spasi putih ketika menemukan konteks"
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "terapkan tambalan terbalik"
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "jangan harap setidaknya satu baris konteks"
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "perbolehkan bingkah yang tumpang tindih"
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "jadi berkata-kata"
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "jangan percaya hitungan baris pada kepala bingkah"
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "akar"
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "tambahkan <akar> di depan semua nama berkas"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "jangan kembalikan kesalahan untuk tambalan kosong"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
-msgstr ""
+msgstr "tidak dapat mengaruskan blob %s"
#: archive-tar.c:265 archive-zip.c:358
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
+msgstr "mode berkas tidak didukung: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
-msgstr ""
+msgstr "tidak dapat memulai saringan '%s'"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
-msgstr ""
+msgstr "tidak dapat mengalihkan pendeskripsi"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
-msgstr ""
+msgstr "saringan '%s' melaporkan kesalahan"
#: archive-zip.c:318
#, c-format
msgid "path is not valid UTF-8: %s"
-msgstr ""
+msgstr "jalur bukan UTF-8 valid: %s"
#: archive-zip.c:322
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
+msgstr "jalur terlalu panjang (%d karakter, SHA1: %s): %s"
#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
#, c-format
msgid "deflate error (%d)"
-msgstr ""
+msgstr "kesalahan deflasi (%d)"
#: archive-zip.c:603
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
+msgstr "stempel waktu terlalu besar untuk sistem ini: %<PRIuMAX>"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <perintah>] --list"
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "Tidak dapat membaca %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "tidak dapat membaca '%s'"
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"
msgid "archive format"
msgstr "format arsip"
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "prefiks"
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "berkas"
msgstr "daftar format arsip yang didukung"
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "repositori"
msgid "retrieve the archive from remote repository <repo>"
msgstr "ambil arsip dari repositori remote <repo>"
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr "perintah"
msgid "Unexpected option --remote"
msgstr "Opsi --remote tak diharapkan"
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "opsi `%s' butuh '%s'"
#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opsi --output tak diharapkan"
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr "tidak dapat membuat berkas '%s'"
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "tidak dapat membaca berkas '%s'"
msgstr ""
"--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr "tidak dapat membaca blob %s untuk jalur %s"
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
+"tidak dapat mewariskan konfigurasi pelacakan hulu banyak referensi ketika "
+"pendasaran ulang diminta"
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr ""
+msgid "not setting branch '%s' as its own upstream"
+msgstr "tidak menyetel '%s' sebagai hulunya"
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr ""
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "cabang '%s' disiapkan untuk melacak '%s' oleh pendasaran ulang."
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
+msgid "branch '%s' set up to track '%s'."
+msgstr "cabang '%s' disiapkan untuk melacak '%s'."
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
+msgid "branch '%s' set up to track:"
+msgstr "cabang '%s' disiapkan untuk melacak:"
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr ""
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "tidak dapat menulis konfigurasi cabang hulu"
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
+"\n"
+"Setelah memperbaiki penyebab kesalahan Anda dapat mencoba memperbaiki\n"
+"informasi pelacakan remote dengan menjalankan:"
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr ""
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr ""
+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"
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr ""
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "tak melacak: informasi ambigu untuk referensi %s"
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr ""
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' bukan nama cabang valid"
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr ""
+msgid "a branch named '%s' already exists"
+msgstr "sebuah cabang bernama '%s' sudah ada"
-#: branch.c:208
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr ""
+msgid "cannot force update the branch '%s'checked out at '%s'"
+msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
+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"
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
-msgstr ""
+msgstr "cabang hulu yang diminta '%s' tidak ada"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr ""
+msgid "not a valid object name: '%s'"
+msgstr "bukan nama objek valid: '%s'"
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr ""
+msgid "ambiguous object name: '%s'"
+msgstr "nama objek ambigu: '%s'"
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr ""
+msgid "not a valid branch point: '%s'"
+msgstr "bukan sebuah titik cabang valid: '%s'"
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr ""
+msgstr "'%s' sudah di-checkout pada '%s'"
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
-msgstr ""
+msgstr "HEAD dari pohon kerja %s tidak diperbarui"
#: bundle.c:44
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "kepala tidak dikenal: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumen tidak dikenal: %s"
msgid "final chunk has non-zero id %<PRIx32>"
msgstr ""
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr "kunci tidak berisi nama variabel: %s"
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "kunci tidak valid: %s"
msgid "invalid mode for object creation: %s"
msgstr "mode tidak valid untuk pembuatan objek: %s"
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "nilai rusak untuk %s"
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "nilai rusak untuk %s: %s"
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "level kompresi pak jelek %d"
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr "gagal menguraikan %s"
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "gagal menguraikan konfigurasi baris perintah"
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s tidak valid: '%s'"
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100"
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d"
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "nama bagian '%s' tidak valid"
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "%s punya banyak nilai"
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gagal menulis berkas konfigurasi baru %s"
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "tidak dapat mengunci berkas konfigurasi %s"
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "membuka %s"
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "pola tidak valid: %s"
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "berkas konfigurasi %s tidak valid"
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "fstat pada %s gagal"
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "tidak dapat me-mmap '%s'%s"
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "chmod pada %s gagal"
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "tidak dapat menulis berkas konfigurasi %s"
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "tidak dapat menyetel '%s' ke '%s'"
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "tidak dapat mem-batal setel '%s'"
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "nama bagian tidak valid: %s"
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "nilai hilang untuk '%s'"
msgid "unable to fork"
msgstr ""
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr ""
"tree"
msgstr ""
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gagal mengurai persentase potongan dirstat '%s'\n"
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parameter dirstat tidak ditketahui '%s'\n"
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
"'dimmed-zebra', 'plain'"
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
"spasi yang lainnya"
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
"%s"
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff eksternal mati, berhenti pada %s"
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check dan -s saling eksklusif"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S dan --find-object saling eksklusif"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S"
+#: diff.c:4597
+#, c-format
+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'"
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
-"dengan -G dan -S"
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' dan '%s'"
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "--follow butuh tepatnya satu spek jalur"
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "nilai --stat tidak valid: %s"
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s harap nilai numerik"
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Gagal menguraikan parameter opsi --dirstat/-X:\n"
"%s"
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "tidak dapat menguraikan '%s'"
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s butuh bentuk <n>/<m>"
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s butuh sebuah karakter, dapat '%s'"
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumen --color-moved jelek: %s"
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode tidak valid '%s' dalam --color-moved-ws"
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
"\"histogram\""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "argumen tidak valid ke %s"
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex tidak valid diberikan ke -I: '%s'"
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argumen --word-diff jelek: %s"
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr "Opsi format keluaran diff"
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "buat tambalan"
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "sembunyikan keluaran diff"
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "<n>"
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "buat diff dengan <n> baris konteks"
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "buat diff dalam format mentah"
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr "sinonim untuk '-p --raw'"
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "sinonim untuk '-p --stat'"
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "--stat yang ramah mesin"
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "keluarkan hanya baris terakhir --stat"
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "<parameter 1,parameter 2>..."
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "sinonim untuk --dirstat=cumulative"
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonim untuk --dirstat=files,param1,param2..."
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "perlihatkan hanya nama berkas yang berubah"
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "perlihatkan hanya nama dan status berkas yang berubah"
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr "buat diffstat"
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "<lebar>"
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "buat diffstat dengan lebar yang diberikan"
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "buat diffstat dengan nama lebar yang diberikan"
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "buat diffstat dengan lebar grafik yang diberikan"
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr "<hitungan>"
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "buat diffstat dengan baris yang terbatas"
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "buat ringkasan singkat dalam diffstat"
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "keluarkan diff biner yang dapat diterapkan"
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\""
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr "perlihatkan diff berwarna"
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr "<tipe>"
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff"
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
"pada --raw atau --numstat"
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "<prefiks>"
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "perlihatkan prefiks tujuan daripada \"b/\""
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr "sebutkan karakter yang menandai konteks daripada ' '"
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr "Opsi penamaan ulang diff"
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
"pembuatan"
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr "deteksi penamaan ulang"
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "lewati pracitra untuk penghapusan"
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr "deteksi penyalinan"
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr ""
"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr "nonaktifkan deteksi penamaan ulang"
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
"ulang/penyalinan melebihi batas yang diberikan"
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "Opsi algoritma diff"
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "abaikan spasi saat membandingkan baris"
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "abaikan perubahan dalam jumlah spasi"
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "abaikan perubahan spasi pada EOL"
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "abaikan kembalian-kurir pada akhir baris"
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "abaikan perubahan yang semua baris kosong"
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff sabar\""
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff histogram\""
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "pilih algoritma diff"
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr "<teks>"
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "gunakan <regex> untuk menentukan apa itu kata"
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "baris kode yang berpindah diwarnai berbeda"
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr "bagaimana spasi diabaikan di --color-moved"
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr "Opsi diff yang lainnya"
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan "
"perlihatkan jalur relatif"
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr "perlakukan semua berkas sebagai teks"
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "tukar dua masukkan, balikkan diff"
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "nonaktifkan semua keluaran program"
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr "<kapan>"
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr "abaikan perubahan submodul dalam pembuatan diff"
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr "<format>"
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "sembunyikan entri 'git add -N' dari indeks"
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr "<untai>"
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan"
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan"
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "kontrol urutan berkas yang muncul dalam keluaran"
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "<jalur>"
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "lewati keluaran ke jalur yang disebutkan"
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr "<id objek>"
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan"
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr "pilih berkas oleh tipe diff"
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr "<berkas>"
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "Keluarkan ke berkas yang disebutkan"
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
"hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas."
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Nama direktori tidak dapat ditebak.\n"
"Mohon sebutkan direktori pada baris perintah"
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr ""
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: daftar dangkal diharapkan"
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: sebuah paket bilasan diharapkan setelah daftar dangkal"
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "tidak dapat menulis ke remote"
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc memerlukan multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "baris dangkal tidak valid: %s"
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "baris dangkal-balik tidak valid: %s"
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "object tidak ditemukan: %s"
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "kesalahan dalam objek: %s"
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "tidak ada dangkal yang ditemukan: %s"
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "dapat %s %d %s"
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "komit tidak valid %s"
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr "menyerah"
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "selesai"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "dapat %s (%d) %s"
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "Menandai %s sebagai lengkap"
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "sudah punya %s (%s)"
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "kesalahan protokol: kepala pak jelek"
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: tidak dapat menggarpu %s"
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: keluaran index-pack tidak valid"
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "%s gagal"
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "kesalahan dalam pemultipleks-balik pita samping"
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "Versi peladen %.*s"
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "Peladen mendukung %s"
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "Peladen tidak mendukung klien dangkal"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "Peladen tidak mendukung --shallow-since"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "Peladen tidak mendukung --shallow-exclude"
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "Peladen tidak mendukung --deepen"
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "Peladen tidak mendukung objek format repositori ini"
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "tidak ada komit umum"
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "repositori sumber dangkal, menolak mengkloning."
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: pengambilan gagal."
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "algoritma tidak cocok: klien %s; peladen %s"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "peladen tidak mendukung algoritma '%s'"
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "Peladen tidak mendukung permintaan dangkal"
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "Peladen mendukung saringan"
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "tidak dapat menulis permintaan kepada remote"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "kesalahan membaca kepala seksi '%s'"
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "diharapkan '%s', diterima '%s'"
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "baris pengakuan tidak diharapkan: %s"
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "kesalahan memproses ack: %d"
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr "berkas pak diharapkan dikirim setelah 'ready'"
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"tidak ada seksi lainnya yang diharapkan dikirim setelah tidak ada 'ready'"
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "gagal memproses info dangkal: %d"
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref diharapkan, dapat '%s'"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref tidak diharapkan: '%s'"
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "kesalahan memproses referensi yang diminta: %d"
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: paket jawaban akhir diharapkan"
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "tidak ada kepala remote yang cocok"
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "remote tidak mengirim semua objek yang dibutuhkan"
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "'ready' tidak diharapkan dari remote"
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "tidak ada referensi remote seperti %s"
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "tidak dapat membuat berkas sementara"
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gagal menulis tandatangan terlepas ke '%s'"
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
"gpg.ssh.allowedSignersFile perlu dikonfigurasi dan ada untuk verifikasi "
"tandatangan ssh"
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"ssh-keygen -Y find-principals/verify diperlukan untuk verifikasi tandatangan "
"ssh (tersedia di openssh versi 8.2p1+)"
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr ""
"berkas pencabutan penandatanganan ssh terkonfigurasi tapi tidak ada: %s"
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "tanda tangan '%s' jelek/tidak kompatibel"
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr ""
"baik user.signingkey atau gpg.ssh.defaultKeyCommand perlu dikonfigurasi"
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr "gpg.ssh.defaultKeyCommand sukses tapi tidak mengembalikan kunci: %s %s"
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr "gpg gagal menandatangani data"
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr "user.signingkey perlu disetel untuk penandatanganan ssh"
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
"ssh-keygen -Y sign diperlukan untuk penandatanganan ssh (tersedia di "
"openssh versi 8.2p1+)"
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors"
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
"didukung dengan -P di bawah PCRE v2"
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': tidak dapat membaca %s"
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "gagal men-stat '%s'"
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "'%s': baca pendek"
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
+msgid "Run '%s' instead [y/N]? "
msgstr ""
#: help.c:654
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr ""
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
" %s"
msgstr ""
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "Sudah terbaru."
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr ""
msgid "failed to read the cache"
msgstr "gagal membaca tembolok"
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "gagal menulis berkas indeks baru"
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "OID kipas-keluar indeks multipak salah ukuran"
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "berkas indeks multipak %s terlalu kecil"
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr "tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
+msgstr ""
+"tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versi indeks multipak %d tidak dikenal"
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id jelek: %u (total pak %u)"
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr "gagal menambah berkas pak '%s'"
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "gagal membuka indeks pak '%s'"
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "gagal melokasi objek %d di dalam berkas pak"
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "tidak dapat menyimpan berkas indeks balik"
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr "tidak dapat menguraikan baris: %s"
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr "baris jelek '%s'."
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr "tidak dapat memuat pak"
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr "tidak dapat membuka indeks untuk %s"
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "Menambahkan berkas pak ke indeks multipak"
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "pak yang disukai tidak dikenal: '%s'"
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr "tidak dapat memilih pak yang disukai %s tanpa objek"
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "pak yang disukai '%s' kadaluarsa"
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr "tidak ada berkas pak untuk diindeks."
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr "tidak dapat menulis bitmap multipak"
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr "gagal menulis indeks multipak"
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "gagal menghapus %s"
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "gagal membersihkan indeks multipak pada %s"
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "berkas indeks multipak ada, tetapi gagal diurai"
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "checksum salah"
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "Mencari berkas pak yang direferensikan"
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = fanout[%d]"
+"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = "
+"fanout[%d]"
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "midx tidak berisi oid"
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr "Memverifikasi urutan OID di dalam indeks multipak"
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "Mengurutkan objek oleh berkas pak"
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "Memverifikasi offset objek"
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "gagal memuat entri pak untuk oid[%d] = %s"
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "gagal memuat indeks pak untuk berkas pak %s"
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "Menghitung objek tereferensi"
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "Mencari dan menghapus berkas pak tak tereferensi"
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "tidak dapat memulai pack-objects"
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "tidak dapat menyelesaikan pack-objects"
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr ""
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr ""
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr ""
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr ""
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr ""
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "tidak dapat membuka %s"
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr ""
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr ""
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr ""
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
msgid "could not write '%s' promisor file"
msgstr ""
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr ""
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr ""
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr ""
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr ""
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr ""
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr ""
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr ""
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr ""
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr ""
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr ""
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr ""
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan 'git "
-"rebase --continue'.\n"
+"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan "
+"'git rebase --continue'.\n"
"Atau Anda dapat membatalkan pendasaran ulang dengan 'git rebase --abort'.\n"
#: rebase-interactive.c:33
"s, squash <komit> = gunakan komit, tapi lebur ke komit sebelumnya\n"
"f, fixup [-C | -c] <komit> = seperti \"squash\" tapi hanya pertahankan\n"
" pesan komit sebelumnya, kecuali -C digunakan, dimana\n"
-" hanya pertahankan pesan komit ini; -c sama dengan -C tapi\n"
-" buka penyunting"
-"x, exec <perintah> = jalankan perintah (sisa baris) menggunakan cangkang\n"
-"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git rebase --continue')\n"
+" hanya pertahankan pesan komit ini; -c sama dengan -C "
+"tapi\n"
+" buka penyuntingx, exec <perintah> = jalankan perintah "
+"(sisa baris) menggunakan cangkang\n"
+"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git "
+"rebase --continue')\n"
"d, drop <komit> = hapus komit\n"
"l, label <label> = tandai HEAD saat ini dengan nama\n"
"t, reset <label> = setel ulang HEAD ke sebuah label\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
-"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus komit.\n"
+"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus "
+"komit.\n"
#: rebase-interactive.c:78
msgid ""
"\n"
msgstr ""
"\n"
-"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang sedang berjalan.\n"
+"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang "
+"sedang berjalan.\n"
"Untuk melanjutkan pendasaran ulang setelah menyunting, jalankan:\n"
" git rebase --continue\n"
"\n"
"\n"
msgstr ""
"\n"
-"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan dibatalkan.\n"
+"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan "
+"dibatalkan.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit eksplisit.\n"
+"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit "
+"eksplisit.\n"
"Gunakan 'git config rebase.missingCommitsCheck untuk' mengganti tingkat "
"peringatan.\n"
"Kelakuan yang mungkin adalah: ignore, warn, error.\n"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr "%s: 'preserve' digantikan oleh 'merges'"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr ""
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr ""
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr ""
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
msgstr ""
#: ref-filter.c:912
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
msgid "invalid branch name: %s = %s"
msgstr ""
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr ""
msgid "invalid refspec '%s'"
msgstr ""
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "tidak dapat mengambil baik %s dan %s ke %s"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s biasanya melacak %s, bukan %s"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s melacak baik %s dan %s"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "kunci '%s' dari pola tidak ada '*'"
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "nilai '%s' dari pola tidak ada '*'"
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr "spek referensi sumber %s tidak cocok dengan apapun"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
"penuh referensi."
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Apakah maksud Anda buat tag baru dengan mendorong ke\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Apakah maksud Anda tag pohon dengan mendorong ke\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Apakah maksud Anda tag blob baru dengan mendorong ke\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s tidak dapat diselesaikan ke cabang"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "referensi tujuan %s menerima dari lebih dari satu sumber"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "HEAD tidak menunjuk ke cabang"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "tidak ada cabang seperti: '%s'"
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "cabang '%s' tidak ada remote untuk didorong"
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "tidak dapat menemukan referensi remote %s"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Abaikan referensi lucu '%s' secara lokal"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Cabang Anda mutakhir dengan '%s'.\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (gunakan \"%s\" untuk selengkapnya)\n"
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
msgid "there were errors while writing '%s' (%s)"
msgstr "ada kesalahan saat menulis '%s' (%s)"
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "gagal membilas '%s'"
msgid "Recorded preimage for '%s'"
msgstr "Pracitra direkam untuk '%s'"
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "tidak dapat membuat direktori '%s'"
msgid "could not determine HEAD revision"
msgstr "tidak dapat menentukan revisi HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "gagal menemukan pohon %s"
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr ""
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr ""
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr ""
"run \"git revert --abort\"."
msgstr ""
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "tidak dapat membaca '%s'"
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr ""
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr ""
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr ""
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr ""
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr ""
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr ""
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr ""
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr ""
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr ""
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr ""
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] ""
msgstr[1] ""
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] ""
msgstr[1] ""
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr ""
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr ""
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr ""
msgid "process for submodule '%s' failed"
msgstr "proses untuk submodul '%s' gagal"
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gagal menguraikan HEAD sebagai referensi valid."
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr ""
msgid "Aborting."
msgstr ""
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr ""
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%s"
msgstr ""
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"%s"
msgstr ""
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"%s"
msgstr ""
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr ""
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr ""
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "bilasan diharapkan setelah argumen pengambilan"
msgid "Fetching objects"
msgstr ""
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "gagal membaca '%s'"
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' pada pohon kerja utama bukan direktori repositori"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' tidak ada"
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' bukan berkas .git, kode error %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' tidak menunjuk kembali ke '%s'"
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "bukan direktori"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ".git bukan berkas"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr "berkas .git rusak"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr "berkas .git salah"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "bukan jalur valid"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
"tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "gitdir tidak dapat dibaca"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "gitdir salah"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "bukan direktori valid"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "berkas gitdir tidak ada"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "tidak dapat membaca berkas gitdir (%s)"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "berkas gitdir tidak valid"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "Perubahan yang akan dikomit:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "Perubahan yang tidak digelar untuk komit:"
msgid "untracked content, "
msgstr "konten yang tak dilacak, "
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Simpanan Anda saat ini ada %d entri"
msgstr[1] "Simpanan Anda saat ini ada %d entri"
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "Submodul berubah tapi tak diperbarui:"
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "Perubahan submodul yang akan dikomit:"
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Jangan ubah atau hapus baris diatas.\n"
"Semua dibawahnya akan diabaikan."
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
"Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "Anda punya jalur yang tak tergabung."
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " (selesaikan konflik dan jalankan \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " (gunakan \"git commit\" untuk mengakhiri penggabungan)"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "Anda berada ditengah-tengah sesi am."
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "Jalur saat ini kosong"
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (selesaikan konflik lalu jalankan \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1227
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit kosong)"
+
+#: wt-status.c:1239
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo hilang."
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "Tidak ada perintah selesai."
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Perintah yang selesai (%d perintah):"
msgstr[1] "Perintah yang selesai (%d perintah):"
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " (lihat lebih lanjut di berkas %s)"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "Tidak ada perintah yang tersisa."
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Perintah berikutnya (%d perintah tersisa):"
msgstr[1] "Perintah berikutnya (%d perintah tersisa):"
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "Anda sedang mendasarkan ulang."
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (selesaikan konflik lalu jalankan \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (gunakan \"git rebase --abort\" untuk check out cabang asal)"
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr "Anda sedang membelah komit saat mendasarkan ulang."
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "Petik ceri sedang berjalan."
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Anda sedang memetik ceri komit %s."
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "Pengembalian sedang berjalang."
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Anda sedang mengembalikan komit %s."
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (selesaikan konflik dan jalankan \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " (jalankan \"git revert --continue\" untuk melanjutkan)"
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (semua konflik sudah selesai: jalankan \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr "Anda sedang membagi dua."
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "Anda berada dalam checkout tipis."
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "Pada cabang "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "sedang mendasarkan ulang interaktif; ke "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "sedang mendasarkan ulang; ke "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "Tidak sedang berada pada cabang apapun."
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "Komit awal"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "Tidak ada komit"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "Berkas tak terlacak"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "Berkas yang diabaikan"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
"untuk tambahkan berkas baru sendiri (lihat 'git help status')."
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "Berkas tak terlacak yang tak disebutkan%s"
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "Tidak ada perubahan"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
"-a\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "tidak ada perubahan untuk dikomit\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
"\"git add\" untuk lacak)\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
"lacak)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "tidak ada yang dikomit\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "Tidak ada komit apapun pada "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD (tanpa cabang)"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "berbeda"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "di belakang "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "di depan "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Tidak dapat membaca indeks"
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "Tidak dapat menulis tambalan"
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "Gagal menyunting tambalan"
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "Tidak dapat men-stat '%s'"
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "Tambalan kosong. Dibatalkan."
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "Tidak dapat terapkan '%s'"
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n"
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "latihan"
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "jadi berkata-kata"
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr "pengambilan interaktif"
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "pilih bingkah secara interaktif"
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "sunting diff saat ini dan terapkan"
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "perbolehkan tambah berkas yang diabaikan"
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "perbarui berkas terlacak"
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti"
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak"
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "abaikan jalur yang terhapus dari pohon kerja (sama dengan --no-all)"
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "jangan tambahkan, hanya segarkan indeks"
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error"
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan"
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
-msgstr ""
+msgstr "perbolehkan perbarui entri di luar kerucut checkout tipis"
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar"
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "peringatkan ketika menambahkan repositori tertanam"
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "tulang belakang untuk `git stash -p`"
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Lihat \"git help submodule\" untuk selengkapnya."
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "menambahkan repositori git tertanam: %s"
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"Matikan pesan ini dengan menjalankan\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "gagal menambahkan berkas"
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file tidak kompatibel dengan --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A dan -u saling tak kompatibel"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' harus berupa -x atau +x"
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul butuh --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' dan argumen spek jalur tidak dapat digunakan bersamaan"
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n"
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"Matikan pesan ini dengan menjalankan\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Nilai tidak valid untuk --empty: %s"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "tidak dapat mengurai skrip pengarang"
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' dihapus oleh kail applypatch-msg"
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Baris masukan salah format: '%s'."
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Gagal menyalin catatan dari '%s' ke '%s'"
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "fseek gagal"
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "tidak dapat mengurai tambalan '%s'"
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus"
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "stempel waktu tidak valid"
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "baris Date tidak valid"
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "offset zona waktu tidak valid"
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "Pendeteksian format tambalan gagal."
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "gagal membuat direktori '%s'"
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Gagal memecah tambalan."
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"."
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Jika Anda lebih suka melewati tambalan ini, jalankan \"%s --skip\" sebagai "
"gantinya."
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+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\"."
+
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Untuk mengembalikan cabang yang asli dan berhenti menambal, jalankan \"%s --"
"abort\""
-#: builtin/am.c:1224
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Tambalan dikirimkan dengan format=flowed; spasi pada akhir baris mungkin "
"hilang."
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Tambalan kosong."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "baris pengarang hilang dalam komit %s"
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "baris identitas tidak valid: %.*s"
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Repositori kekurangan blob yang diperlukan untuk mundur ke penggabungan 3 "
"arah."
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..."
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Apakah Anda menyunting tambalan Anda?\n"
"Itu tidak diterapkan ke blob yang direkam dalam indeksnya."
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..."
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "Gagal menggabungkan perubahan."
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "menerapkan ke sebuah riwayat kosong"
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "tidak dapat melanjutkan: %s tidak ada."
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "Badan komit adalah:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Terapkan? [y]a/[n] tidak/[e] sunting/[v] lihat tambalan/terim[a] semua: "
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "tidak dapat menulis berkas indeks"
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)"
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Melewatkan: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Membuat sebuah komit kosong: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Tambalan kosong."
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "Menerapkan: %.*s"
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "Tidak ada perubahan -- tambalan sudah diterapkan"
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Penambalan gagal pada %s %.*s"
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Gunakan 'git am --show-current-patch=diff' untuk melihat tambalan yang gagal"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Tidak ada perubahan - direkam sebagai komit kosong."
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Jika tidak ada lagi yang diterapkan, sepertinya sesuatu yang lain sudah \n"
"memasukkan perubahan yang sama; mungkin Anda ingin melewatkan tambalan ini."
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh "
"mereka\" untuk itu."
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "Tidak dapat mengurai objek '%s'."
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr "gagal membersihkan indeks"
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n"
"Tidak memutar ulang ke ORIG_HEAD"
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Nilai tidak valid untuk --patch-format: %s"
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Nilai tidak valid untuk --show-current-patch: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s tidak kompatibel untuk --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "Opsi '%s=%s' dan '%s=%s' tidak dapat digunakan bersamaan"
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opsi>] (--continue | --skip | --abort)"
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "jalankan secara interaktif"
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "opsi bersejarah -- no-op"
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan"
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "jadi senyap"
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "tambahkan trailer Signed-off-by kepada pesan komit"
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "koding ulang ke dalam utf8 (asali)"
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "lewatkan opsi -k ke git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "lewatkan opsi -b ke git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "lewatkan opsi -m ke git-mailinfo"
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox"
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr"
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "copot semuanya sebelum garis gunting"
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "lewatkannya melalui git-mailinfo"
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "lewatkannya melalui git-apply"
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr "n"
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "format tambalan yang ada di"
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "timpa pesan error ketika kegagalan penambalan terjadi"
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik"
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "sinonim untuk --continue"
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "lewati tambalan saat ini"
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr "kembalikan cabang asli dan batalkan operasi penambalan"
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu"
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "perlihatkan tambalan yang diterapkan"
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "rekam tambalan kosong sebagai komit kosong"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "berbohong soal tanggal pengkomit"
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang"
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "tandatangani komit dengan GPG"
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "bagaimana cara menangani tambalan kosong"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "(penggunaan internal untuk git-rebase)"
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"Opsi -b/--binary telah menjadi no-op untuk waktu yang lama, dan\n"
"itu akan dihapus. Mohon jangan gunakan itu lagi."
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr "gagal membaca indeks"
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"direktori pendasaran ulang sebelumnya %s masih ada tapi mbox diberikan."
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Direktori menyimpang %s ditemukan.\n"
"Gunakan \"git am --abort\" untuk menghapusnya."
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan."
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "mode interaktif butuh tambalan pada baris perintah"
msgid "show work cost statistics"
msgstr "perlihatkan statistik biaya usaha"
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "paksa laporkan perkembangan"
msgid "ignore whitespace differences"
msgstr "abaikan perbedaan spasi putih"
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "revisi"
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress tidak dapat digunakan dengan --incremental atau format porselen"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "4 tahun, 11 bulan yang lalu"
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "berkas %s hanya punya %lu baris"
msgstr[1] "berkas %s hanya punya %lu baris"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "Menyalahkan baris"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opsi>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"menghapus cabang '%s' yang sudah digabungkan ke\n"
" '%s', tapi belum digabungkan ke HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"tidak menghapus cabang '%s' yang belum digabungkan ke\n"
" '%s', walaupun tergabung ke HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Tidak dapat mencari objek komit untuk '%s'"
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Cabang '%s' belum sepenuhnya tergabung.\n"
"Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'."
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "Pembaruan berkas konfigurasi gagal"
msgid "Couldn't look up commit object for HEAD"
msgstr "Tidak dapat mencari objek komit untuk HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "cabang pelacak remote '%s' tidak ditemukan."
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr "cabang '%s' tidak ditemukan."
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Cabang %s (yaitu %s) dihapus.\n"
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "tidak dapat menguraikan untai format"
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "tidak dapat menguraikan HEAD"
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) merujuk diluar refs/heads/"
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Cabang %s sedang didasarkan ulang pada %s"
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Cabang %s sedang dibagi dua pada %s"
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada."
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada."
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nama cabang tidak valid: '%s'"
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "Penggantian nama cabang gagal"
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "Penyalinan cabang gagal"
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Salinan cabang salah nama '%s' dibuat"
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Cabang salah nama '%s' berganti nama"
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Cabang berganti nama ke %s, tapi HEAD tidak diperbarui!"
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Baris yang diawali dengan '%c' akan dicopot.\n"
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "Opsi generik"
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu"
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "sembunyikan pesan informasi"
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "pasang mode pelacakan (lihat git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "setel konfigurasi pelacakan cabang"
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr "jangan gunakan"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr "hulu"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "ubah info hulu"
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "batal-setel info hulu"
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "gunakan keluaran berwarna"
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "lakukan pada cabang pelacak remote"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "cetak hanya cabang yang berisi komit"
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "cetak hanya cabang yang tak berisi komit"
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "Aksi git-branch spesifik:"
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "sebut baik cabang pelacak remote dan cabang lokal"
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "hapus cabang yang tergabung sepenuhnya"
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "hapus cabang (walaupun tak tergabung)"
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr "pindah/ganti nama cabang dan reflog-nya"
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "pindah/ganti nama cabang, walaupun target ada"
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "salin cabang dan reflog-nya"
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "salin cabang, walapun target ada"
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "sebut nama cabang"
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "perlihatkan nama cabang saat ini"
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "buat reflog cabang"
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "sunting deskripsi cabang"
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "paksa buat, pindah/ganti nama, hapus"
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "cetak hanya cabang yang tergabung"
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "cetak hanya cabang yang tak tergabung"
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "sebut cabang dalam kolom"
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr "objek"
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "cetak hanya cabang objek"
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "pengurutan dan penyaringan tak peka kapital"
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format yang digunakan untuk keluaran"
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD tidak ditemukan di bawah refs/heads!"
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column dan --verbose tidak kompatibel"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "nama cabang diperlukan"
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang"
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Belum ada komit pada cabang '%s'."
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "Tidak ada cabang bernama '%s'."
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "terlalu banyak cabang untuk operasi penyalinan"
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "terlalu banyak argumen untuk operasi penggantian nama"
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "terlalu banyak argumen untuk menyetel hulu baru"
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
"apapun."
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "tidak ada cabang '%s'"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "cabang '%s' tidak ada"
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "terlalu banyak argumen untuk batal-setel hulu"
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"tidak dapat membatal-setel hulu HEAD ketika itu tak menunjuk pada cabang "
"apapun."
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Cabang '%s' tidak ada informasi hulu"
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"Opsi -a dan -r tidak mengambil nama cabang.\n"
"Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr ""
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "jalur '%s' tidak punya versi kami"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "jalur '%s' tidak punya versi mereka"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "jalur '%s' tidak punya semua versi yang diperlukan"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "jalur '%s' tidak punya versi yang diperlukan"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "jalur '%s': tidak dapat gabung"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Konflik penggabungan %d dibuat ulang"
msgstr[1] "Konflik penggabungan %d dibuat ulang"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d jalur diperbarui dari %s"
msgstr[1] "%d jalur diperbarui dari %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "%d jalur diperbarui dari indeks"
msgstr[1] "%d jalur diperbarui dari indeks"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' tidak dapat digunakan untuk %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
"bersamaan."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "baik '%s' atau '%s' tidak disebutkan"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "jalur '%s' tak tergabung"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"berikut:\n"
"%s"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "HEAD sekarang berada di"
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "tidak dapat memperbarui HEAD"
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ganti ulang cabang '%s'\n"
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "Sudah berada pada '%s'\n"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Ganti ke dan ganti cabang '%s'\n"
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Ganti ke cabang baru '%s'\n"
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Ganti ke cabang '%s'\n"
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr "... dan %d lainnya.\n"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"saat yang tepat untuk dilakukan dengan:\n"
"git branch <nama-cabang-baru> %s\n"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "kesalahan internal dalam jalan revisi"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "Posisi HEAD sebelumnya adalah"
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "Anda berada pada cabang yang belum lahir"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"seperti remote 'origin', pertimbangkan untuk menyetel\n"
"checkout.defaultRemote=origin di konfigurasi Anda"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "hanya satu referensi yang diharapkan"
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr "hanya satu referensi yang diharapkan, %d diberikan"
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "referensi tidak valid: %s"
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensi bukan pohon: %s"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "sebuah cabang diharapkan, dapat tag '%s'"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "sebuah cabang diharapkan, dapat '%s'"
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "sebuah cabang diharapkan, dapat komit '%s'"
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"tidak dapat mengganti cabang di tengah sesi am\n"
"Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
"worktree add\"."
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "Anda mengganti cabang saat pembagian dua"
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' tidak dapat digunakan dengan '%s'"
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' tidak bisa mengambil <titik-awal>"
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "kehilangan argumen cabang atau komit"
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "lakukan penggabungan 3 arah dengan cabang baru"
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "gaya"
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "gaya konflik (merge atau diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "gaya konflik (merge, diff3, atau zdiff3)"
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "lepas HEAD pada komit bernama"
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "setel info hulu untuk cabang baru"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "pasang mode pelacakan (lihat git-pull(1))"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "paksa checkout (buang modifikasi lokal)"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "cabang baru"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "cabang baru tanpa induk"
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "perbarui berkas yang diabaikan (default)"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan"
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "checkout versi kami untuk berkas yang tak tergabung"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "checkout versi mereka untuk berkas yang tak tergabung"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "jangan batasi jalur spek hanya ke entri tipis"
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c dan --orphan saling eksklusif"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p dan --overlay saling eksklusif"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "opsi '-%c', '-%c', dan '%s' tidak dapat digunakan bersamaan"
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "--track butuh nama cabang"
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "kehilangan nama cabang; coba -%c"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "tidak dapat menyelesaikan %s"
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "spesifikasi jalur tidak valid"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'"
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file tidak kompatible dengan --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
"men-checkout index"
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "Anda harus sebutkan jalur untuk dipulihkan"
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "cabang"
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "buat dan checkout cabang baru"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "buat/setel ulang dan checkout cabang"
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "buat reflog untuk cabang baru"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "gunakan mode hamparan (default)"
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "buat dan ganti ke cabang baru"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "buat/setel ulang dan ganti ke cabang"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "buang modifikasi lokal"
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "mana mirip-cabang untuk di-checkout"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "pulihkan indeks"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "pulihkan pohon kerja (default)"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "abaikan entri yang tak tergabung"
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "gunakan mode hamparan"
msgid "could not lstat %s\n"
msgstr "tidak dapat me-lstat %s\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Menolak menghapus direktori kerja saat ini\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Akan menolak menghapus direktori kerja saat ini\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - pilih item berdasarkan prefiks unik\n"
" - (kosong) tidak pilih apa-apa\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - pilih semua item\n"
" - (kosong) selesai memilih\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Huh (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Masukkan pola pengabaian>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Pilih item untuk dihapus"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Hapus %s [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - layar ini\n"
"? - bantuan untuk bisik pemilihan"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Akan menghapus item berikut:"
msgstr[1] "Akan menghapus item berikut:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "jangan cetak nama berkas yang dihapus"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "paksa"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "pembersihan interaktif"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "hapus keseluruhan direktori"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "pola"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "tambahkan <pola> ke aturan pengabaian"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "juga hapus berkas terabaikan"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "hanya hapus berkas terabaikan"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; "
"menolak membersihkan"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
"menolak membersihkan"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x dan -X tidak dapat digunakan bersamaan"
msgid "directory from which templates will be used"
msgstr "direktori dimana templat akan digunakan"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "repositori rujukan"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "gunakan --reference hanya pada saat kloning"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nama"
msgid "path to git-upload-pack on the remote"
msgstr "jalur ke git-upload-pack pada remote"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr "kedalaman"
msgid "create a shallow clone of that depth"
msgstr "buat klon dangkal sedalam kedalaman tersebut"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr "waktu"
msgid "create a shallow clone since a specific time"
msgstr "buat klon dangkal sejak waktu yang disebutkan"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "revisi"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr "klon hanya satu cabang, HEAD atau --branch"
msgid "set config inside the new repository"
msgstr "setel konfigurasi di dalam repositori baru"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "spesifik ke server"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opsi untuk transmisi"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "gunakan hanya alamat IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "gunakan hanya alamat IPv6"
msgid "cannot unlink temporary alternates file"
msgstr "tidak dapat batal-taut berkas alternatif sementara"
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "Terlalu banyak argumen."
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "Anda harus sebutkan repositori untuk diklon."
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare dan --origin %s tidak kompatibel."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare dan --separate-git-dir tidak kompatibel."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan"
#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositori '%s' tidak ada"
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr "kedalaman %s bukan bilangan positif"
msgid "working tree '%s' already exists."
msgstr "pohon kerja '%s' sudah ada."
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "tidak dapat membuat direktori pendahulu '%s'"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr ""
msgid "Collecting commits from input"
msgstr ""
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr ""
msgid "duplicate parent %s ignored"
msgstr "induk duplikat %s diabaikan"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "bukan nama objek valid %s"
msgid "id of a parent commit object"
msgstr "id objek komit induk"
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr "pesan"
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "pesan komit"
msgid "read commit log message from file"
msgstr "baca pesan log komit dari berkas"
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Tandatangani komit dengan GPG"
msgid "failed to unpack HEAD tree object"
msgstr "gagal membuka objek pohon HEAD"
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file dengan -a tidak masuk akal"
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "tidak dapat menggabungkan -m dengan --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "opsi '%s' dan '%s:%s' tidak dapat digunakan bersamaan"
#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgid "Error building trees"
msgstr "Kesalahan membangun pohon"
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n"
msgid "Invalid ignored mode '%s'"
msgstr "Mode terabaikan '%s' tidak valid"
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode berkas tak terlacak '%s' tidak valid"
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long dan -z tidak kompatibel"
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang."
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "opsi reword '%s' dan jalur '%s' tidak dapat digunakan bersamaan"
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "opsi reword '%s' dan '%s' tidak dapat digunakan bersamaan"
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal"
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "Anda tidak punya apapun untuk diubah."
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah."
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan"
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan."
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F."
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend."
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Hanya salah satu dari --include/--only/--all/--interactive/--patch yang "
"dapat digunakan."
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr ""
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "jalur '%s ...' dengan -a tidak masuk akal"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "perlihatkan status dengan ringkas"
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "perlihatkan informasi cabang"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "perlihatkan informasi stase"
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "hitung nilai didepan/dibelakang penuh"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr "versi"
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "keluaran yang dapat dibaca mesin"
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "perlihatkan status dalam format panjang (asali)"
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "akhiri entri dengan NUL"
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
"(Asali: traditional)"
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "bila"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
"all)"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "sebut berkas tak terlacak dalam kolom"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "jangan deteksi penggantian nama"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "sembunyikan rangkuman setelah komit berhasil"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "perlihatkan diff dalam templat pesan komit"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "Opsi pesan komit"
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "Baca pesan dari berkas"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr "pengarang"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "timpa pengarang komit"
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "tangal"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "timpa tanggal komit"
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "komit"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "gunakan kembali pesan dari komit tersebut"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]komit"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang "
"komit yang disebutkan"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)"
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr ""
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "tambahkan trailer Signed-off-by"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "gunakan templat berkas tersebut"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "paksa sunting komit"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr "masukkan status dalam templat pesaan komit"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "Opsi isi komit"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "komit semua berkas terubah"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "tambah berkas secara interaktif"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "tambah perubahan secara interaktif"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "hanya komit berkas tersebut"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr "lewati kail pre-commit dan commit-msg"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "perlihatkan apa yang akan dikomit"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "ubah komit sebelumnya"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "lewati kail post-rewrite"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "ok merekam perubahan kosong"
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "ok merekam perubahan dengan pesan kosong"
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Berkas MERGE_HEAD (%s) rusak"
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "tidak dapat membaca MERGE_MODE"
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "tidak dapat membaca pesan komit: %s"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Batalkan komit karena pesan komit kosong.\n"
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Batalkan komit karena badan pesan komit kosong.\n"
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr "jangan pertimbangkan tag yang cocok dengan <pola>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "perlihatkan objek komit singkat sebagai langkah terakhir"
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long tidak kompatibel dengan --abbrev=0"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty tidak kompatibel dengan mirip-komit"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken tidak kompatibel dengan mirip-komit"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin dan --merge-base saling eksklusif"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
msgid "%s...%s: no merge base"
msgstr "%s...%s: tidak ada dasar penggabungan"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "bukan repositori git"
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objek yang diberikan '%s' tidak valid"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "lebih dari dua blob diberikan: '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "objek tak tertangani '%s' diberikan"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "tidak dapat membaca tautan simbolik %s"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "tidak dapat membaca berkas tautan simbolik %s"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "tidak dapat membaca objek %s untuk symlink %s"
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
"format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n"
"mode diff direktori ('-d' dan '--dir-diff')."
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "kedua berkas berubah: '%s' dan '%s'."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "berkas pohon kerja telah ditinggalkan."
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "berkas sementara ada di '%s'."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "mungkin Anda ingin membersihkan atau memulihkan itu."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr "gagal: %d"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "gunakan `diff.guitool` daripada `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "lakukan diff direktori penuh"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "jangan bisiki sebelum meluncurkan alat diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "gunakan tautan simbolik dalam mode diff direktori"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr "alat"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "gunakan alat diff yang disebutkan"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "cetak daftar alat diff yang bisa digunakan dengan `--tool`"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
"buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan "
"kode keluar bukan nol"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "sebutkan perintah kustom untuk melihat diff"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "dilewatkan ke `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool butuh pohon kerja atau --no-index"
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff tidak kompatibel dengan --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool dan --extcmd saling eksklusif"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opsi rev-list]"
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Kesalahan: Tidak dapat mengekspor tag bersarang kecuali jika --mark-tags "
"disebutkan."
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "token --anonymize-map tidak bisa kosong"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "perlihatkan perkembangan setelah <n> objek"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "pilih penanganan tag bertandatangan"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "pilih penanganan tag yang men-tag objek tersaring"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr "pilih penanganan pesan komit dalam pengkodean alternatif"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "buang tanda ke berkas ini"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "impor tanda dari berkas ini"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "impor tanda dari berkas ini jika ada"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "palsukan pen-tag ketika tidak ada pada tag"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "keluarkan pohon penuh untuk setiap komit"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "gunakan fitur selesai untuk mengakhiri arus"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "lewati keluaran data blob"
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "spek referensi"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "terapkan spek referensi ke referensi terekspor"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonimkan keluaran"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "dari:ke"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "ubah <dari> ke <ke> pada keluaran teranonim"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "perlihatkan id objek asli dari blob/komit"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "label tag dengan id tanda"
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map tanpa --anonymize tidak masuk akal"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"Tidak dapat melewatkan baik --import-marks dan --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Kehilangan tanda dari untuk submodul '%s'"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Kehilangan tanda ke untuk submodul '%s'"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Perintah 'mark' diharapkan, dapat %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Perintah 'to' diharapkan, dapat %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
"Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
msgid "Lockfile created but not reported: %s"
msgstr "Berkas kunci dibuat tetapi tidak dilaporkan: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opsi>] <grup>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opsi>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel tidak dapat bernilai negatif"
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "ambil dari semua remote"
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "setel hulu untuk git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "jalur ke paket unggah pada sisi remote"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "paksa timpa referensi lokal"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "ambil dari banyak remote"
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "ambil semua tag dan objek yang bersesuaian"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "jangan ambil semua tag (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "jumlah submodul yang diambil secara bersamaan"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr ""
+msgstr "modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "buang cabang pelacak remote yang tidak ada pada remote"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "sesuai permintaan"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "kontrol pengambilan submodul rekursif"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "simpan paket yang diunduh"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "bolehkan perbarui referensi HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "perdalam riwayat klon dangkal"
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "ubah ke repositori penuh"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "tambahkan ini ke jalur keluaran submodul"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"default untuk ambil submodul secara rekursif (prioritas lebih rendah "
"dariberkas konfigurasi)"
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "terima referensi yang memperbarui .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "peta referensi"
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "sebutkan ambil peta referensi"
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "lakukan 'maintenance --auto' setelah pengambilan"
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "periksa pembaruan terpaksa pada semua cabang"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "tulis grafik komit setelah pengambilan"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "terima spek referensi dari masukan standar"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
msgstr "tidak dapat menemukan referensi remote HEAD"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
msgid "[up to date]"
msgstr "[terkini]"
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr "[tertolak]"
msgid "can't fetch in current branch"
msgstr "tidak dapat mengambil di cabang saat ini"
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr "ter-check out di dalam pohon kerja lainnya"
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr "[pembaruan tag]"
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr "tidak dapat memperbarui referensi lokal"
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr "akan klob tag yang ada"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr "[tag baru]"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr "[cabang baru]"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr "[referensi baru]"
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr "pembaruan terpaksa"
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr "bukan-maju-cepat"
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Ambil secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
-"tapi pemeriksaan tersebut dinonaktifkan. Untuk aktifkan kembali, gunakan\n"
-"'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
+"fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
+"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, gunakan\n"
+"bendera '--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
"true'."
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"Butuh waktu %2.f detik untuk periksa pembaruan terpaksa. Anda dapat\n"
+"Butuh waktu %2.f detik untuk memeriksa pembaruan terpaksa; Anda dapat\n"
"menggunakan '--no-show-forced-updates' atau jalankan\n"
"'git config fetch.showForcedUpdates false'\n"
-" untuk menghindari pemeriksaan ini.\n"
+"untuk menghindari pemeriksaan ini.\n"
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tidak mengirim semua objek yang diperlukan\n"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr "Dari %.*s\n"
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s akan menjadi terjuntai)"
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s telah menjadi terjuntai)"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr "[dihapus]"
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr "(tidak ada)"
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'"
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Opsi \"%s\" diabaikan untuk %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "opsi \"%s\" diabaikan untuk %s\n"
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr "objek '%s' tidak ada"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada cabang "
+"apapun."
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "tidak setel hulu untuk cabang remote pelacak remote"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr "tidak setel hulu untuk tag remote"
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr "tipe cabang tidak diketahui"
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"cabang sumber tidak ditemukan.\n"
+"cabang sumber tidak ditemukan;\n"
"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr "Mengambil %s\n"
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
-msgstr "Tidak dapat mengambil %s"
+msgid "could not fetch %s"
+msgstr "tidak dapat mengambil %s"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n"
-"cabang yang mana revisi baru sebaiknya diambil."
+"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
+"remote yang mana revisi baru sebaiknya diambil"
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Anda perlu sebutkan nama tag"
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
+msgstr "Anda perlu sebutkan sebuah nama tag"
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Kedalaman negatif di --deepen tidak didukung"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
+msgstr "kedalaman negatif pada --deepen tidak didukung"
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen dan --depth saling eksklusif"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow pada repositori penuh tidak masuk akal"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tidak mengambil argumen repositori"
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all tidak masuk akal dengan spek referensi"
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "tidak ada remote atau grup remote seperti itu: %s"
+msgid "no such remote or remote group: %s"
+msgstr "tidak ada remote atau grup remote seperti: %s"
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal"
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr "harus suplai remote ketika menggunakan --negotiate-only"
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokol tidak mendukung --negotiate-only, keluar."
-
#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol tidak mendukung --negotiate-only, keluar."
+
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
"extensions.partialclone"
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr ""
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr ""
msgid "%s: object is of unknown type '%s': %s"
msgstr "%s: objek bertipe tidak dikenal '%s': %s"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objek tidak dapat diuraikan: %s"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "sha1 berkas jelek: %s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Memeriksa direktori objek"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Memeriksa direktori objek"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Memeriksa tautan %s"
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s tidak valid"
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s menunjuk ke sesuatu yang aneh (%s)"
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD terpisah tidak menunjuk ke apapun"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Memeriksa pohon tembolok"
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "bukan pohon pada pohon tembolok"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opsi>] [<objek>...]"
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "perlihatkan objek yang tak dapat dicapai"
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "perlihatkan objek teruntai"
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "laporkan tag"
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "laporkan simpul akar"
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "buat objek indeks simpul kepala"
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "buat log referensi simpul kepala (asali)"
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "juga pertimbangkan pak dan objek alternatif"
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "hanya periksa konektivitas"
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "aktifkan pemeriksaan lebih ketat"
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "tulis objek teruntai dalam .git/lost-found"
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "perlihatkan perkembangan"
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Memeriksa objek"
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: objek hilang"
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'"
msgid "failed to parse '%s' value '%s'"
msgstr "gagal menguraikan nilai '%s' '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "tidak dapat men-stat '%s'"
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "tidak dapat membaca '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "pangkas objek tak tereferensi"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "aktifkan mode gc otomatis"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "pak ulang semua pak yang lain kecuali pak terbesar"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gagal menguraikan nilai gc.logexpiry %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "gagal menguraikan nilai pangkas kadaluarsa %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Mempak otomatis repositori di latar belakang untuk performa optimal.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Mempak otomatis repositori untuk performa optimal.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Lihat \"git help gc\" untuk pembenahan manual.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc sudah berjalan pada mesin '%s' pid %<PRIuMAX> (gunakan --force jika tidak)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git "
"prune' untuk menghapusnya."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<tugas>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule tidak diperbolehkan"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argumen --schedule tidak dikenal '%s'"
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "gagal menulis grafik komit"
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "gagal mem-praambil remote"
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr "gagal memulai proses 'git pack-objects'"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr "gagal menyelesaikan proses 'git pack-objects'"
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "gagal menulis indeks multipak"
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' gagal"
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' gagal"
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan"
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "tugas '%s' gagal"
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' bukan tugas yang valid"
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "tugas '%s' tidak dapat dipilih berulang kali"
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "jalankan tugas berdasarkan keadaan repositori"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "frekuensi"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "jalankan tugas berdasarkan frekuensi"
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr ""
"jangan laporkan perkembangan atau informasi lainnya ke kesalahan standar"
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr "tugas"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "jalankan tugas spesifik"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "gagal menjalankan 'git config'"
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "gagal memperluas jalur '%s'"
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "gagal menjalankan launchctl"
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "gagal membuat direktori untuk '%s'"
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "gagal men-tali-botkan layanan %s"
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "gagal membuat berkas xml sementara"
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "gagal menjalankan schtasks"
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"gagal menjalankan 'crontab -l'; sistem Anda mungkin tidak mendukung 'cron'"
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'"
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "gagal membuka masukan standar dari 'crontab'"
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' mati"
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr "gagal memulai systemctl"
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr "gagal menjalankan systemctl"
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr "gagal menghapus '%s'"
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr "argumen --scheduler tidak dikenal '%s'"
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr "baik pewaktu systemd atau crontab tidak tersedia"
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr "penjadwal %s tidak tersedia"
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "proses lainnya sedang menjadwalkan peme"
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr "git maintenance start [--scheduler=<penjadwal>]"
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr "penjadwal"
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr "penjadwal untuk memicu git maintenance run"
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "gagal menambahkan repositori ke konfigurasi global"
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subperintah> [<opsi>]"
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "subperintah tidak valid: %s"
msgid "unrecognized help format '%s'"
msgstr "format bantuan tidak dikenal '%s'"
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "gagal menjalankan emacsclient."
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "gagal menguraikan versi emacsclient."
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "versi emacsclient '%d' terlalu usang (< 22)."
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr "gagal menjalankan '%s'"
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': jalur untuk pembaca man yang tidak didukung.\n"
"Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': cmd untuk pembaca man yang didukung.\n"
"Mohon gunakan 'man.<tool>.path' sebagai gantinya."
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': pembaca man tidak dikenal"
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "tidak ada pembaca man yang menangani permintaan"
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr "tidak ada pembaca info yang menangani permintaan"
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' dialiaskan ke '%s'"
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "untai alias.%s jelek: %s"
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr "opsi ini tidak mengambil argumen lainnya"
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "penggunaan: %s%s"
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "'git help config' untuk informasi lebih lanjut"
msgid "unknown hash algorithm '%s'"
msgstr "algoritma hash tak dikenal '%s'"
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin memerlukan repositori git"
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format tidak dapat digunakan dengan --stdin"
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify tanpa nama berkas paket diberikan"
msgid "specify the hash algorithm to use"
msgstr "tentukan algoritma hash yang akan digunakan"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir dan --bare saling eksklusif"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "Keluaran terakhir: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: berkas jelek"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "tidak dapat membaca objek %s"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "tipe tidak dikenal: %d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: sampul tidak valid dari mode deskripsi"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "format.headers tanpa nilai"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "tidak dapat membuka berkas tambalan %s"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "butuh tepatnya satu rentang"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "bukan sebuah rentang"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "sampul surat butuh format email"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "gagal membuat berkas sampul surat"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to gila: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "dua direktori keluaran?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "komit tidak dikenal %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "gagal menguraikan '%s' sebagai referensi valid"
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "tidak dapat menemukan dasar penggabungan eksak"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id "
"dasar komit>"
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "tidak dapat menemukan dasar penggabungan eksak"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "dasar komit seharusnya menjadi leluhur daftar revisi"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "dasar komit tidak seharusnya dalam daftar revisi"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "tidak dapat mendapatkan id tambalan"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr "gagal menduga asal range-diff dari seri saat ini"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "gunakan [PATCH] bahkan dengan banyak tambalan"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "cetak tambalan ke keluaran standar"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "buat sampul surat"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "gunakan <akhiran> daripada '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "mulai menomorkan tambalan pada <n> daripada 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr ""
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "tandai seri sebagai gulung ulang ke-N"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "panjang nama berkas keluaran maksimum"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "gunakan [RFC PATCH] daripada [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "gunakan [<prefix>] daripada [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "simpan hasil berkas di <direktori>"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "jangan copot/tambah [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "jangan keluarkan diff biner"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "keluarkan hash semua-nol di kepala From"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "jangan termasuk tambalan yang cocok dengan komit hulu"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "Perpesanan"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "kepala"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "tambahkan kepala email"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "email"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "tambahkan kepala To:"
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "tambahkan kepala Cc:"
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr "buat surat pertama balasan ke <id pesan>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "perbatasan"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "lampirkan tambalan"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "bariskan tambalan"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr "aktifkan utasan pesan, gaya: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "tanda tangan"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "tambah tanda tangan"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "dasar komit"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "tambahkan info pohon prasyarat ke seri tambalan"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "tambahkan tandatangan dari berkas"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "jangan cetak nama berkas tambalan"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr "perlihatkan perkembangan ketika membuat tambalan"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu "
"tambalan"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "persentase dimana pembuatan tertimbang"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "baris identitas tidak valid: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n dan -k saling eksklusif"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc dan -k saling eksklusif"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "--name-only tidak masuk akal"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "--name-status tidak masuk akal"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "--check tidak masuk akal"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, dan --output-directory saling eksklusif"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff butuh --cover-letter atau satu tambalan"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff terhadap v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor butuh --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff butuh --cover-letter atau satu tambalan"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff terhadap v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "tidak dapat membaca berkas tanda tangan '%s'"
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "Membuat tambalan"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "tidak dapat membuat berkas keluaran"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
"secara manual.\n"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opsi>] [<berkas>...]"
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr "pisahkan jalur dengan karakter NUL"
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "identifikasi status berkas dengan tag"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "perlihatkan berkas yang dihapus di dalam keluaran"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "perlihatkan berkas yang berubah di dalam keluaran"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "perlihatkan berkas lainnya di dalam keluaran"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "perlihatkan berkas terabaikan di dalam keluaran"
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "hanya perlihatkan nama direktori 'lainnya'"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "perlihatkan akhiran baris berkas"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "jangan perlihatkan direktori kosong"
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "perlihatkan berkas tak tergabung di dalam keluaran"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "perlihatkan informasi resolve-undo"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "lewati berkas yang cocok dengan pola"
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr "baca pola pengecualian dari <berkas>"
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "tambahkan pengecualian git standar"
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "buat keluaran relatif terhadap direktori puncak proyek"
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "rekursi melalui submodul"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
"jika <berkas> apapun tidak berada di indeks, perlakukan sebagai kesalahan"
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "mirip-pohon"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "berpura-pura bahwa jalur yang dihapus sejak <mirip-pohon> masih ada"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "perlihatkan data penirkutuan"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "hapus entri duplikat"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "perlihatkan direktori tipis di hadapan indeks tipis"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr ""
#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
+msgid "use a zealous diff3 based merge"
msgstr ""
#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
+msgid "for conflicts, use our version"
msgstr ""
#: builtin/merge-file.c:41
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr ""
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr ""
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opsi>] [<komit>...]"
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "tombol `m' butuh sebuah nilai"
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "opsi `%s' butuh sebuah nilai"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n"
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Strategi yang tersedia:"
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Strategi kustom yang tersedia:"
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "jangan perlihatkan diffstat pada akhir penggabungan"
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "perlihatkan diffstat pada akhir penggabungan"
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinonim untuk --stat)"
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan"
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "buat satu komit daripada melakukan penggabungan"
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "lakukan komit jika penggabungan sukses (asali)"
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "sunting pesan sebelum komit"
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "perbolehkan maju cepat (asali)"
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "batalkan jika maju cepat tidak dimungkinkan"
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid"
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "strategi penggabungan yang digunakan"
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "opsi=nilai"
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "opsi untuk strategi penggabungan yang dipilih"
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)"
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "gunakan <nama> daripada target sebenarnya"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "batalkan penggabungan yang sedang berlangsung saat ini"
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort tapi biarkan indeks dan pohon kerja"
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "perbolehkan penggabungan riwayat yang tak terkait"
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "lewati kail pre-merge-commit dan commit-msg"
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "tidak dapat menjalankan stase."
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "stase gagal"
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "bukan objek valid: %s"
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree gagal"
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Lumat komit -- tak perbarui HEAD\n"
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' tidak menunjuk pada sebuah komit"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Untai branch.%s.mergeoptions jelek: %s"
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Tak tangani apapun selain penggabungan dua kepala."
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr "opsi strategi tidak dikenal: -X%s"
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "tidak dapat menulis %s"
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Tidak dapat membaca dari '%s'"
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan "
"penggabungan.\n"
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
"topik.\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Pesan kosong membatalkan komit.\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
"komit.\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "Pesan komit kosong"
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "Luar biasa.\n"
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "Tidak ada cabang saat ini."
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "Tidak ada remote untuk cabang saat ini."
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "bukan sesuatu yang kami bisa gabungkan"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "--abort harap tanpa argumen"
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "--quit harap tanpa argumen"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "--continue harap tanpa argumen"
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
"Mohon komit perubahan Anda sebelum Anda gabungkan."
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
"Mohon komit perubahan Anda sebelum Anda gabungkan."
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)."
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "Lumat komit ke kepala kosong belum didukung"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong"
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "menolak menggabungkan riwayat tak terkait"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "Memperbarui %s..%s\n"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "Tidak.\n"
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Memutar ulang pohon ke asli...\n"
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Mencoba strategi penggabungan %s...\n"
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Tidak ada strategi yang menangani penggabungan.\n"
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Penggabungan dengan strategi %s gagal.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr ""
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr ""
msgid "refs snapshot for selecting bitmap commits"
msgstr ""
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr "Mengganti nama %s ke %s\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "gagal mengganti nama '%s'"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr ""
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr ""
msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr ""
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr ""
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr ""
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr "kontrol penggunaan kail pre-merge-commit dan commit-msg"
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "stash/stash pop otomatis sebelum dan sesudah"
msgstr "<remote>"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "<cabang>"
msgid "ignoring --verify-signatures for rebase"
msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"Anda dapat melakukannya dengan menjalankan salah satu perintah berikut\n"
"suatu saat sebelum penarikan berikutnya:\n"
"\n"
-" git config pull.rebase false # penggabungan (strategi asali)\n"
+" git config pull.rebase false # penggabungan\n"
" git config pull.rebase true # pendasaran ulang\n"
" git config pull.ff only # hanya maju cepat\n"
"\n"
"Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n"
-"menyetel pilihan 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"
"asali terkonfigurasi untuk setiap invokasi.\n"
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke "
"indeks."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "tarik dengan pendasaran ulang"
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "mohon komit atau stase itu."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch memperbarui kepala cabang saat ini.\n"
"memajukan-cepat pohon kerja Anda dari komit %s."
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"untuk memulihkan."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr "Tidak dapat maju cepat ke banyak cabang."
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan."
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
msgid "failed to push some refs to '%s'"
msgstr "gagal dorong beberapa referensi ke '%s'"
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "repositori"
msgid "request atomic transaction on remote side"
msgstr "minta transaksi atomik pada sisi remote"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags "
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete tidak masuk akal tanpa referensi"
"\n"
" git push <nama>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all dan --tags tidak kompatibel"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all tidak dapat digabung dengan spek referensi"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror dan --tags tidak kompatibel"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all dan --mirror tidak kompatibel"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "opsi dorong harus tidak ada karakter baris baru"
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "--preserve-merges digantikan oleh --rebase-merges"
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'"
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
msgstr "--strategy butuh --merge atau --interactive"
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan"
+msgid "apply options and merge options cannot be used together"
+msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan"
#: builtin/rebase.c:1476
#, c-format
msgstr "tidak ada cabang/komit seperti '%s'"
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "Tidak ada referensi seperti: %s"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <direktori git>"
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n"
"variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'."
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'."
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "diam"
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Anda harus menyebutkan sebuah direktori."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "Anda harus menyebutkan sebuah direktori"
#: builtin/reflog.c:17
msgid ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists <referensi>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' bukan stempel waktu valid"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "Menandai objek yang bisa dicapai..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "%s tidak menunjuk ke apapun!"
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "tidak ada log referensi yang disebutkan untuk dihapus"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "bukan sebuah log referensi: %s"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "tidak ada log referensi untuk '%s'"
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "format referensi tidak valid: %s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
msgid "Updating %s"
msgstr "Memperbarui %s"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Tidak dapat mengambil %s"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
msgid "could not start pack-objects to repack promisor objects"
msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji"
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects."
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "tidak dapat membuka indeks untuk %s"
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri"
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "pak %s terlalu besar untuk digulung"
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis"
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr "tidak dapat menutup berkas sementara jepretan referensi"
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "pak semuanya dalam satu pak"
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar"
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr "hapus pak berlebihan, dan jalankan git-prune-packed"
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "lewatkan --no-reuse-delta ke git-pack-objects"
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "lewatkan --no-reuse-object ke git-pack-objects"
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "jangan jalankan git-update-server-info"
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "lewatkan --local ke git-pack-objects"
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "tulis indeks bitmap"
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "lewatkan --delta-islands ke git-pack-objects"
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "tanggal aproksimasi"
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini"
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "dengan -a, pak ulang objek yang tak dapat dicapai"
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "ukuran jendela yang digunakan untuk kompresi delta"
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "bita"
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"sama seperti yang diatas, tetapi batasi penggunaan memori daripada hitungan "
"entri"
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "batasi kedalaman delta maksimum"
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "batasi jumlah utas maksimum"
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "ukuran maksimum setiap berkas pak"
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "pak ulang objek dalam pak yang ditandai dengan .keep"
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "jangan pak ulang pak ini"
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "temukan deret geometri dengan faktor <N>"
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr "tulis indeks multipak dari pak yang dihasilkan"
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "tidak dapat menghapus pak dalam repositori objek berharga"
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable dan -A tidak kompatibel"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric tidak kompatibel dengan -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "Tidak ada yang baru untuk dipak."
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "berkas yang diperlukan hilang: %s"
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "tidak dapat membatal taut: %s"
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr ""
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr ""
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr ""
msgid "unable to generate diff for '%s'"
msgstr ""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<mirip-pohon>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "campuran"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "lunak"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "keras"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "gabungan"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "simpan"
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Anda tidak punya HEAD yang valid."
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Gagal menemukan pohon HEAD."
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Gagal menemukan pohon dari %s."
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD sekarang pada %s"
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan."
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "diam, hanya laporkan kesalahan"
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "setel ulang HEAD dan indeks"
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "hanya setel ulang HEAD"
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "setel ulang HEAD, indeks dan pohon kerja"
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "setel ulang HEAD tapi simpan perubahan lokal"
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr "hanya rekam fakta bahwa jalur yang terhapus akan ditambahkan nanti"
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid."
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed dengan jalur usang; sebagai gantinya gunakan 'git reset --<jalur>'."
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Tidak dapat lakukan reset %s dengan jalur."
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Reset %s tidak diperbolehkan dalam repositori bare"
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N hanya dapat digunakan dengan --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "Perubahan tak tergelar setelah setel ulang:"
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"Anda dapat menggunakan '--quiet' untuk hindari hal ini. Setel konfigurasi\n"
"reset.quiet ke true untuk membuat hal tersebut asali.\n"
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'."
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "Tidak dapat menulis berkas indeks baru."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "tidak dapat menggabungkan --exclude-promisor-objects dan --missing"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "penyaringan objek memerlukan --objects"
msgstr "rev-list tidak mendukung penampilan catatan"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "penghitungan tertanda tidak kompatibel dengan --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "hitungan tertanda dan '%s' tidak dapat digunakan bersamaan."
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgid "show <n> most recent ref-log entries starting at base"
msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --"
-"merge-base"
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid"
msgid "no such ref %s"
msgstr "tidak ada referensi seperti %s"
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "tidak dapat menangani lebih dari %d revisi."
msgstr[1] "tidak dapat menangani lebih dari %d revisi."
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' bukan sebuah referensi yang valid."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "tidak dapat menemukan komit %s (%s)"
msgid "git sparse-checkout list"
msgstr ""
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr ""
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"cone"
msgstr ""
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr ""
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr ""
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:667
-msgid "read patterns from standard in"
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
msgstr ""
#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr ""
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr ""
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
-" [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n"
-" [--] [<spek jalur>...]]"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
+" [-q|--quiet] [-u|--include-untracked] [-a|--all]\n"
+" [-m|--message <pesan>] [--pathspec-from-file=<berkas>\n"
+" [--pathspec-file-nul]] [--] [<spek jalur>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<pesan>]"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
+" [-
q|--quiet] [-u|--include-untracked] [-a|--all] [<pesan>]"
#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgid "Index was not unstashed."
msgstr "Indeks tak dibatal-stasekan."
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "coba membuat ulang indeks"
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) dijatuhkan"
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Tidak dapat menjatuhkan entri stase"
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bukan referensi stase"
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr "Entri stase disimpan jika Anda butuh itu lagi."
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "Tidak ada nama cabang yang disebutkan"
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "gagal menguraikan pohon"
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "gagal membongkar pohon"
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "masukkan berkas tak terlacak ke dalam stase"
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "Tidak dapat memperbarui %s dengan %s"
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "pesan stase"
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" butuh satu argumen <komit>"
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Tidak ada perubahan yang tergelar"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "Tidak ada perubahan yang dipilih"
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "Anda belum punya komit awal"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "Tidak dapat menyimpan berkas tak terlacak"
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini"
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Tidak dapat menyimpan keadaan tergelar saat ini"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "Tidak dapat merekam keadaan pohon kerja"
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Tidak dapat menggunakan --patch dan --include-untracked atau --all pada "
"waktu yang bersamaan"
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+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"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "Anda lupa untuk 'git add'?"
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "Tidak ada perubahan lokal untuk disimpan"
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "Tidak dapat menginisialisasi stase"
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "Tidak dapat menyimpan status saat ini"
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Direktori kerja dan keadaan indeks %s disimpan"
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "Tidak dapat menghapus perubahaan pohon kerja"
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "jaga indeks"
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "hanya stase perubahan tergelar"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "stase dalam mode tambalan"
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "mode hening"
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "masukkan berkas tak terlacak ke dalam stase"
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "masukkan berkas ignore"
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Mengharapkan nama referensi penuh, dapat %s"
"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
"hulu otoritatif tersendiri."
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr "jangkar alternatif untuk jalur relatif"
msgid "failed to recurse into submodule '%s'"
msgstr "gagal merekursi ke dalam submodul '%s'"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "sembunyikan keluaran status submodul"
msgid "could not fetch a revision for HEAD"
msgstr "tidak dapat mengambil revisi untuk HEAD"
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached dan --files saling eksklusif"
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda "
-"benar-benar ingin menghapus itu termasuk semua riwayatnya)"
+"Pohon kerja submodul '%s' berisi direktori .git. Ini akan diganti dengan "
+"berkas .git oleh dengan menggunakan absorbgitdirs."
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
"menyingkirkan itu"
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Direktori '%s' dibersihkan\n"
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "tidak dapat membuat direktori submodul kosong %s"
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n"
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "batal daftar semua submodul"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul"
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
" itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
"kloning degan '--reference-if-able' daripada '--reference'."
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain"
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr "direktori tidak kosong: '%s'"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "di mana submodul baru akan dikloning"
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "nama submodul baru"
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr "url di mana submodul dikloning"
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "kedalaman untuk kloning dangkal"
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "paksa perkembangan kloning"
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
"<url> --path <jalur>"
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Jalur submodul '%s' tidak diinisialisasi"
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Melewati submodul tak tergabung %s"
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Melewati submodul '%s'"
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "Tidak dapat men-checkout '%s' pada jalur submodul '%s'"
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "Gagal mendasarkan ulang '%s' pada jalur submodul '%s'"
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "Tidak dapat menggabungkan '%s' pada jalur submodul '%s'"
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "Eksekusi '%s %s' gagal di jalur submodul '%s'"
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "Jalur submodul '%s': ter-checkout '%s'\n"
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "Jalur submodul '%s: terdasarkan ulang ke '%s''\n"
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "Jalur submodul '%s': tergabung dalam '%s'\n"
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "Jalur submodul '%s': '%s %s'\n"
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
"Tidak dapat mengambil di dalam jalur submodul '%s'; mencoba mengambil "
"langsung %s:"
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. "
"Pengambilan langsung komit tersebut gagal."
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "jalur ke dalam pohon kerja"
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan"
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "pekerjaan paralel"
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "jangan cetak perkembangan pengkloningan"
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]"
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "nilai jelek untuk parameter pembaruan"
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr ""
"sembunyikan keluaran untuk pembaruan oleh pendasaran ulang atau penggabungan"
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr "paksa pembaruan checkout"
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr "jangan ambil objek baru dari situs remote"
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr "timpa mode pembaruan jika repositori adalah kloning segar"
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr "kedalaman untuk pengambilan dangkal"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr "sha1"
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr "SHA1 diharapkan oleh proyek super"
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr "subsha1"
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr "SHA1 dari HEAD submodul"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr "git submodule--helper run-update-procedure [<opsi>] <jalur>"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
"super, tapi proyek super tidak pada cabang apapun"
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "rekursi ke dalam submodul"
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules"
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr "batal setel konfigurasi dalam berkas .gitmodules"
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nama> [<nilai>]"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nama>"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja"
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "sembunyikan keluaran penyetelan url submodule"
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "setel cabang pelacak asali ke master"
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "setel cabang pelacak asali"
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>"
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "--branch atau --default dibutuhkan"
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch dan --default saling eksklusif"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n"
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' sudah ada dan bukan repo git valid"
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:\n"
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--"
"name'."
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n"
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Tidak dapat men-checkout submodul '%s'"
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "Tidak dapat menambahkan submodul '%s'"
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "Gagal mendaftarkan jalur submodul '%s'"
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr "'%s' sudah ada di dalam indeks"
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "'%s' sudah ada di dalam indeks dan bukan submodul"
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr "cabang repositori untuk ditambahkan sebagai submodul"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr "perbolehkan menambah jalur submodul yang diabaikan"
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr "hanya cetak pesan kesalahan"
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr "pinjam objek dari repositori referensi"
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr ""
"setel nama submodul ke untai yang diberikan daripada diasalkan ke jalurnya"
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]"
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Jalur relatif hanya dapat digunakan dari level atas dari pohon kerja"
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr "URL repo: '%s' harus absolut atau diawali dengan ./|../"
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' bukan nama submodul yang valid"
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s tidak mendukung --super-prefix"
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' bukan subperintah submodule--helper valid"
"Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapus itu bila "
"Anda mau.\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "tidak dapat menandatangani tag"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr "tipe objek jelek."
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "tidak ada pesan tag?"
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Pesan tag dibiarkan di %s\n"
msgid "print only tags of the object"
msgstr "hanya cetak tag dari objek"
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column dan -n tidak kompatibel"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "opsi -n hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "opsi --contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "opsi --merged dan --no-merged hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "hanya satu opsi -F atau -m yang diperbolehkan."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "opsi '%s' hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' bukan nama tag yang valid."
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' sudah ada"
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' diperbarui (yaitu %s)\n"
msgid "initializing"
msgstr ""
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr ""
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr ""
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr ""
"untuk baca tentang perintah atau konsep spesifik.\n"
"Lihat 'git help git' untuk gambaran tentang sistem."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "tidak ada direktori yang diberikan untuk --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "tidak ada direktori yang diberikan untuk opsi '%s'\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "tidak ada direktori yang diberikan untuk --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "tidak ada direktori yang diberikan untuk -C\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr "alias rekursif: %s"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "kegagalan menulis pada keluaran standar"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "kegagal menulis tidak diketahui pada keluaran standar"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "penutupan gagal pada keluaran standar"
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s"
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "tidak dapat menangani %s sebagai bawaan"
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"penggunaan: %s\n"
"\n"
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n"
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "gagal menjalankan perintah '%s': %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr ""
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr ""
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr ""
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr ""
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr ""
msgstr ""
#: command-list.h:65
-msgid "Switch branches or restore working tree files"
+msgid "Ensures that a reference name is well formed"
msgstr ""
#: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
msgstr ""
#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:68
msgstr ""
#: command-list.h:116
-msgid "The Git repository browser"
+msgid "Show commit logs"
msgstr ""
#: command-list.h:117
-msgid "Show commit logs"
+msgid "Show information about files in the index and the working tree"
msgstr ""
#: command-list.h:118
-msgid "Show information about files in the index and the working tree"
+msgid "List references in a remote repository"
msgstr ""
#: command-list.h:119
-msgid "List references in a remote repository"
+msgid "List the contents of a tree object"
msgstr ""
#: command-list.h:120
-msgid "List the contents of a tree object"
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
+msgid "Run tasks to optimize Git repository data"
msgstr ""
#: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
+msgid "Join two or more development histories together"
msgstr ""
#: command-list.h:124
-msgid "Join two or more development histories together"
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
#: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Run a three-way file merge"
msgstr ""
#: command-list.h:126
-msgid "Run a three-way file merge"
+msgid "Run a merge for files needing merging"
msgstr ""
#: command-list.h:127
-msgid "Run a merge for files needing merging"
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
+msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:129
msgstr ""
#: command-list.h:130
-msgid "Show three-way merge without touching index"
+msgid "Creates a tag object with extra validation"
msgstr ""
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:132
-msgid "Creates a tag object with extra validation"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:135
-msgid "Find symbolic names for given revs"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:136
-msgid "Add or inspect object notes"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:138
-msgid "Create a packed archive of objects"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:139
-msgid "Find redundant pack files"
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
+msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:141
-msgid "Compute unique ID for a patch"
+msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
+msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:145
-msgid "Update remote refs along with associated objects"
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:148
-msgid "Reads tree information into the index"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:149
-msgid "Reapply commits on top of another base tip"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:150
-msgid "Receive what is pushed into the repository"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:151
-msgid "Manage reflog information"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:152
-msgid "Manage set of tracked repositories"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:153
-msgid "Pack unpacked objects in a repository"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:155
-msgid "Generates a summary of pending changes"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:157
-msgid "Reset current HEAD to the specified state"
+msgid "Restore working tree files"
msgstr ""
#: command-list.h:158
-msgid "Restore working tree files"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:159
-msgid "Revert some existing commits"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:161
-msgid "Pick out and massage parameters"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:162
-msgid "Remove files from the working tree and from the index"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:163
-msgid "Send a collection of patches as emails"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:166
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:167
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:168
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:169
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:170
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:172
-msgid "Common Git shell script setup code"
+msgid "Initialize and modify the sparse-checkout"
msgstr ""
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:174
msgstr ""
#: command-list.h:175
-msgid "Add file contents to the staging area"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:176
-msgid "Show the working tree status"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:177
-msgid "Remove unnecessary whitespace"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:178
-msgid "Initialize, update or inspect submodules"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Switch branches"
msgstr ""
#: command-list.h:180
-msgid "Switch branches"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:184
-msgid "Unpack objects from a packed archive"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:185
-msgid "Register file contents in the working tree to the index"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:186
-msgid "Update the object name stored in a ref safely"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:188
-msgid "Send archive back to git-archive"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:190
-msgid "Show a Git logical variable"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:191
-msgid "Check the GPG signature of commits"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:192
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:193
-msgid "Check the GPG signature of tags"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:195
-msgid "Show logs with difference each commit introduces"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:196
-msgid "Manage multiple working trees"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:197
-msgid "Create a tree object from the current index"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:198
-msgid "Defining attributes per path"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:199
-msgid "Git command-line interface and conventions"
+msgid "Providing usernames and passwords to Git"
msgstr ""
#: command-list.h:200
-msgid "A Git core tutorial for developers"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:201
-msgid "Providing usernames and passwords to Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:202
-msgid "Git for CVS users"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:203
-msgid "Tweaking diff output"
+msgid "Frequently asked questions about using Git"
msgstr ""
#: command-list.h:204
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:205
-msgid "Frequently asked questions about using Git"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:206
-msgid "A Git Glossary"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:207
-msgid "Hooks used by Git"
+msgid "The Git repository browser"
msgstr ""
#: command-list.h:208
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
#: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:210
-msgid "Defining submodule properties"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:211
-msgid "Git namespaces"
+msgid "Helper programs to interact with remote repositories"
msgstr ""
#: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:213
-msgid "Git Repository Layout"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
+msgid "Mounting one repository inside another"
msgstr ""
#: command-list.h:215
-msgid "Mounting one repository inside another"
+msgid "A tutorial introduction to Git"
msgstr ""
#: command-list.h:216
msgstr ""
#: command-list.h:217
-msgid "A tutorial introduction to Git"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:218
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr ""
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "fatal: perintah '%s' mati dengan kode keluar %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "penyunting keluar dengan kotor, membatalkan semua"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' berisi email yang dibuat.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan "
"pemeriksaan ini.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "tidak dapat menjalankan git format-patch diluar repositori\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah "
"atau opsi konfigurasi)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Setelan --confirm tidak dikenal: '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "peringatan: `:include:` tidak didukung: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "peringatan: baris sendmail tidak dikenal: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n"
" * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Gagal membuka direktori %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"Tidak ada berkas tambalan yang disebutkan!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Tidak ada baris subjek di %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Gagal membuka untuk menulis %s: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Gagal membuka %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Gagal membuka %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Surel rangkuman kosong, lewati\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Anda yakin ingin menggunakan <%s> [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Berkas berikut 8bit, tetapi tidak menyebutkan Content-Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda "
"benar-benar ingin mengirim.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Kepada siapa surel harus dikirim (jika ada)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID yang akan digunakan sebagai In-Reply-To untuk surel pertama (jika "
"ada)?"
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Apa yang Anda lakukan dengan alamat ini? ([q] keluar|[d] jatuh|[e] sunting): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Jalur CA \"%s\" tidak ada"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Balasan kirim surel ini diperlukan"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Peladen tidak mendukung STARTTLS! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS gagal! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Tidak dapat menginisialisasi SMTP dengan benar. Periksa konfigurasi dan "
"gunakan --smtp-debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Gagal mengirim %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Terkirim-kering %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Terkirim %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "OK-kering. Log berkata:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Log berkata:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Hasil: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Hasil: OK\n"
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "tidak dapat membuka berkas %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Tidak dapat menjalankan '%s'"
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Menambahkan %s: %s dari: '%s'\n"
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) gagal menutup pipa ke '%s'"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "tidak dapat mengirim pesan sebagai 7bit"
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "pengkodean transfer tidak valid"
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"peringatan: tidak ada tambalan yang dikirimkan\n"
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "tidak dapat membuka %s: %s\n"
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"fatal: %s:%d lebih panjang dari 998 karakter\n"
"peringatan: tidak ada tambalan yang dikirimkan\n"
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
# Swedish translations for Git.
-# Copyright (C) 2010-202
1 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-202
2 Peter Krefting <peter@softwolves.pp.se>
# This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010-2021.
+# Peter Krefting <peter@softwolves.pp.se>, 2010-2022.
#
msgid ""
msgstr ""
"Project-Id-Version: git 2.34.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-11 23:20+0100\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
+"PO-Revision-Date: 2022-01-11 16:34+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.30.1\n"
+"X-Generator: Gtranslator 3.38.0\n"
#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "kunde inte läsa indexet"
msgid "could not stage '%s'"
msgstr "kunde inte köa \"%s\""
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "kunde inte skriva indexet"
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
msgid "ignoring unmerged: %s"
msgstr "ignorerar ej sammanslagen: %s"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Uppdatera patch"
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Granska diff"
msgid "(empty) select nothing"
msgstr "(tomt) markera ingenting"
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Vad nu"
msgid "unstaged"
msgstr "ej köad"
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "sökväg"
msgid "could not refresh index"
msgstr "kunde inte uppdatera indexet"
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Köa tillägg [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Köa stycket [y,n,q,a,d%s,?]? "
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr "Markerade stycken kan inte appliceras på indexet!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
msgid "No other hunks to goto"
msgstr "Inga andra stycken att gå till"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
msgid "No other hunks to search"
msgstr "Inga andra stycken att söka efter"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject och --3way kan inte användas samtidigt."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way utanför arkiv"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index utanför arkiv"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached utanför arkiv"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "\"%s\" utanför arkiv"
#: apply.c:800
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Utför trevägssammanslagning...\n"
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Misslyckades utföra trevägssammanslagning...\n"
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Faller tillbaka på direkt tillämpning...\n"
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg \"%s\""
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "indata känns inte igen"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")"
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "antal"
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "markera nya filer med \"git add --intent-to-add\""
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"försök en trevägssammanslagning, fall tillbaka på normal patch om det "
"misslyckas"
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr "åtgärd"
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "var pratsam"
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "rot"
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "ge inte någon felkod för tomma patchar"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "kunde inte starta filtret \"%s\""
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "kan inte omdirigera handtag"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "filtret \"%s\" rapporterade fel"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "kan inte läsa %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "prefix"
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "fil"
msgstr "visa understödda arkivformat"
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "arkiv"
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr "kommando"
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "flaggan \"%s\" kräver \"%s\""
#: archive.c:582
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"\n"
-"När du har rättat felorsaken kan du försöka rätta\n"
-"fjärrspårningsinformationen genom att utföra\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"kan inte ärva uppströmsspårningsinformation från flera referenser när "
+"ombasering är vald"
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "ställer inte in grenen %s som sin egen uppströmsgren"
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr ""
-"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
-"ombasering."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering."
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
+msgid "branch '%s' set up to track '%s'."
+msgstr "grenen \"%s\" inställd på att spåra \"%s\"."
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
-"ombasering."
+msgid "branch '%s' set up to track:"
+msgstr "grenen \"%s\" inställd på att spåra:"
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "kan inte skriva inställningar för uppströmsgren"
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
+"\n"
+"När du har rättat felorsaken kan du försöka rätta\n"
+"fjärrspårningsinformationen genom att utföra:"
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald"
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
-"ombasering."
+"bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning "
+"är vald"
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Kan inte skriva inställningar för uppströmsgren"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "spårar inte: tvetydig information för referensen %s"
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Spårar inte: tvetydig information för referensen %s"
+msgid "'%s' is not a valid branch name"
+msgstr "\"%s\" är inte ett giltigt grennamn"
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "\"%s\" är inte ett giltigt grennamn."
+msgid "a branch named '%s' already exists"
+msgstr "det finns redan en gren som heter \"%s\""
-#: branch.c:208
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter \"%s\"."
+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:213
-msgid "Cannot force update the current branch."
-msgstr "Kan inte tvinga uppdatering av aktuell gren."
+#: 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:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren"
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
"för att ställa in uppströmskonfigurationen när du sänder in."
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Objektnamnet är inte giltigt: \"%s\"."
+msgid "not a valid object name: '%s'"
+msgstr "objektnamnet är inte giltigt: \"%s\""
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Objektnamnet är tvetydigt: \"%s\"."
+msgid "ambiguous object name: '%s'"
+msgstr "objektnamnet är tvetydigt: \"%s\""
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: \"%s\"."
+msgid "not a valid branch point: '%s'"
+msgstr "avgreningspunkten är inte giltig: \"%s\""
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "kan inte skriva bunt med version %d med algoritmen %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
msgid "unable to find all commit-graph files"
msgstr "kan inte hitta alla incheckingsgraffiler"
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr "kunde inte hitta incheckningen %s"
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "kunde inte hämta typ för objektet %s"
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr "Läser in kända incheckningar i incheckningsgraf"
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr "Rensar incheckningsmärken i incheckningsgraf"
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr "Beräknar topografiska nivåer för incheckningsgraf"
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr "Beräknar generationsvärden för incheckningsgraf"
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr "Samlar refererade incheckningar"
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr "fel vid tillägg av paketet %s"
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr "fel vid öppning av indexet för %s"
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr "Söker ytterligare kanter i incheckingsgraf"
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr "kunde inte skapa inledande kataloger för %s"
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr "kan inte skapa temporärt graflager"
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "kan inte justera delade behörigheter för \"%s\""
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Skriver ut incheckningsgraf i %d pass"
msgstr[1] "Skriver ut incheckningsgraf i %d pass"
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr "Söker sammanslagna incheckningar"
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr "Slår ihop incheckningsgraf"
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr "för många incheckningar för att skriva graf"
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
"trasig"
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr "Bekräftar incheckningar i incheckningsgrafen"
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "incheckningsgrafens förälder för %s är %s != %s"
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
"noll på annan plats"
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
"%s, men noll på annan plats"
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
"= %<PRIuMAX>"
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "kunde inte utföra mmap på \"%s\"%s"
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
"en arbetskatalog."
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
"\""
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
"blankstegslägen"
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "
-"-S"
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\""
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
-"all med -G och -S"
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\" och \"%s\""
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "ogiltigt värde för --stat: %s"
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s förväntar ett numeriskt värde"
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "okänt värde efter ws-error-highlight=%.*s"
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "kunde inte slå upp \"%s\""
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s förväntar formen <n>/<m>"
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s förväntar ett tecken, fick \"%s\""
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "felaktigt argument till --color-moved: %s"
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ogiltigt läge %s\" i --color-moved-ws"
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
"\"histogram\""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "ogiltigt argument för %s"
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "felaktigt argument --word-diff: %s"
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr "Formatflaggor för diff-utdata"
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "skapar patch"
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "<n>"
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "skapa diffar med <n> rader sammanhang"
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "generera diff i råformat"
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr "synonym till \"-p --raw\""
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "synonym till \"-p --stat\""
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "maskinläsbar --stat"
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "skriv bara ut den sista raden för --stat"
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "synonym för --dirstat=cumulative"
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonym för --dirstat=filer,param1,param2..."
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "visa endast namnen på ändrade filer"
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "visa endast namn och status för ändrade filer"
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr "skapa diffstat"
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "<bredd>"
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "generera en diffstat med given bredd"
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "generera en diffstat med given namnbredd"
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "generera en diffstat med given grafbredd"
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr "<antal>"
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "generera diffstat med begränsade rader"
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "skapa kompakt översikt i diffstat"
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "skapa en binärdiff som kan appliceras"
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr "visa färgad diff"
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr "<typ>"
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
"\"new\" (nya) rader i diffen"
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
"eller --numstat"
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "visa givet källprefix istället för \"a/\""
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "visa givet målprefix istället för \"b/\""
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "lägg till ytterligare prefix på alla rader i utdata"
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "visa inte käll- eller målprefix"
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "<tecken>"
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "ange tecken för att ange ny rad istället för \"+\""
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "ange tecken för att ange gammal rad istället för \"-\""
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr "ange tecken för att ange sammanhang istället för \" \""
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr "Diff-namnbytesflaggor"
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr "detektera namnändringar"
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "ta bort för-version för borttagningar"
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr "detektera kopior"
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr "använd oförändrade som källa för att hitta kopior"
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr "inaktivera detektering av namnbyten"
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "använd tomma blob:ar som namnändringskälla"
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
"given gräns"
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "Alternativ för diff-algoritm"
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "skapa minsta möjliga diff"
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "ignorera blanktecken vid radjämförelse"
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "ignorera blanktecken vid radslut"
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "ignorera CR-tecken vid radslut"
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "ignorera ändringar i rader som är helt blanka"
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "<reguttr>"
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristik för att flytta diff-gränser för lättare läsning"
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "skapa diffar med algoritmen \"patience diff\""
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "skapa diffar med algoritmen \"histogram diff\""
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr "<algoritm>"
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "välj en diff-algoritm"
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr "<text>"
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "skapa diffar med algoritmen \"anchored diff\""
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "<läge>"
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "använd <reguttr> för att bestämma vad som är ett ord"
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "flyttade kodrader färgas på annat sätt"
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr "hur blanktecken ignoreras i --color-moved"
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr "Andra diff-flaggor"
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
"sökvägar"
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr "hantera alla filer som text"
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "växla två indatafiler, vänd diffen"
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "avsluta med 1 vid ändringar, annars 0"
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "slå av alla utdata från programmet"
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "tillåt köra en extern diff-hjälpare"
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr "<när>"
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorera ändringar i undermoduler när diffen skapas"
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr "<format>"
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "ange hur ändringar i undermoduler visas"
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "dölj \"git add -N\"-poster från indexet"
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr "<sträng>"
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
"uttryck"
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "styr ordningen i vilken filer visas i utdata"
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "<sökväg>"
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "visa ändringen i angiven sökväg först"
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "hoppa över utdata fram till angiven sökväg"
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr "<objekt-id>"
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr "välj filter efter diff-typ"
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr "<fil>"
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "Skriv utdata till en specifik fil"
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"uttömmande namnbytesdetektering hoppades över på grund av för många filer."
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
"gånger"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "inaktiverar konmönstermatchning"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "kan inte använda %s som exkluderingsfil"
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr "kunde inte öppna katalogen \"%s\""
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr "indexfilen trasig i arkivet %s"
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr "Filtrerar innehåll"
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "felaktig git-namnrymdssökväg \"%s\""
msgid "too many args to run %s"
msgstr "för många flaggor för att köra %s"
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "kunde inte skriva till fjärren"
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "klart"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-patch: ogiltig utdata från index-pack"
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "Servern stöder %s"
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "Servern stöder inte det här arkivets objektformat"
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "källarkivet är grunt, tillåter inte kloning."
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: hämtning misslyckades."
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "omaka algoritmer: klient %s; server %s"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "servern stöder inte algoritmen \"%s\""
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "Servern stöder filter"
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "kunde inte skriva anrop till fjärren"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "oväntad bekräftelserad: \"%s\""
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr "väntade att paketfil skulle sändas efter \"ready\""
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: förväntade svarsavslutningspaket"
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "oväntat \"ready\" från fjärr"
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"
"signaturer"
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"
"signaturer (tillgängligt i openssh version 8.2p1+)"
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "felaktig/inkompatibel signatur \"%s\""
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr ""
"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr "user.signingkey måste anges för ssh-signering"
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "
"version 8.2p1+)"
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
"P under PCRE v2"
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Köra \"%s\" istället? (j/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Köra \"%s\" istället (j/N)?"
#: help.c:654
#, c-format
msgid "quoted CRLF detected"
msgstr "citerad CRLF upptäcktes"
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "felaktig funktion \"%s\" för \"%s\""
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
"lämnad i trädet."
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
"sammanslagning:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "Redan à jour."
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-indexets OID-utbredning har fel storlek"
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-indexfilen %s är för liten"
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-indexversionen %d stöds inte"
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "bad pack-int-id: %u (%u paket totalt)"
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "kan inte spara reverse-index-fil"
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr "kunde inte tolka rad: %s"
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr "felaktig rad: %s"
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr "kunde inte läsa paket{"
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr "kunde inte öppna indexet för %s"
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "Lägger till paketfiler till multi-pack-index"
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "okänt föredraget paket: %s"
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr "kan inte välja föredraget paket %s som inte har några objekt"
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "såg inte paketfilen %s som skulle kastas"
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "föredraget paket \"%s\" har löpt ut"
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr "inga paketfiler att indexera."
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr "kunde inte skriva fler-paketsbitkarta"
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr "kunde inte skriva flerpakets-index"
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "felaktig kontrollsumma"
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "Ser efter refererade packfiler"
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "midx saknar oid"
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr "Bekräftar OID-ordning i multi-pack-index"
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "Sorterar objekt efter packfil"
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "misslyckades läsa paketindex för paketfil %s"
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "Räknar refererade objekt"
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ser efter och tar bort orefererade packfiler"
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "kunde inte starta pack-objects"
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "kunde inte avsluta pack-objects"
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "kunde inte normalisera supplerande objektsökväg: %s"
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "kan inte normalisera objektkatalogen: %s"
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr "kan inte läsa \"alternates\"-filen"
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr "kunde inte hitta objektkatalog för %s"
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr "mmap misslyckades%s"
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr "trasigt löst objekt \"%s\""
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "skräp i slutet av löst objekt \"%s\""
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr "kan inte tolka %s-huvud"
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr "felaktig objekttyp"
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr "kan inte packa upp %s-huvudet"
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr "huvudet för %s är för långt, mer än %d byte"
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr "misslyckades läsa objektet %s"
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr "ersättningen %s hittades inte för %s"
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "löst objekt %s (lagrat i %s) är trasigt"
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "packat objekt %s (lagrat i %s) är trasigt"
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr "kunde inte skriva filen %s"
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr "kan inte sätta behörigheten till \"%s\""
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr "fel vid skrivning av fil"
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr "fel vid stängning av fil för löst objekt"
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr "kan inte skapa temporär fil"
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr "kunde inte skriva fil för löst objekt"
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "förvirrad av instabil objektkälldata för %s"
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "\"utime()\" misslyckades på %s"
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr "kan inte läsa objekt för %s"
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr "trasik incheckning"
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr "trasig tagg"
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr "läsfel vid indexering av %s"
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr "för lite lästes vid indexering av %s"
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: misslyckades lägga in i databasen"
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash stämmer inte för %s (förväntade %s)"
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr "kan inte utföra \"mmap\" för %s"
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr "kan inte packa upp huvud för %s"
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr "kan inte tolka huvud för %s"
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
msgid "hash mismatch %s"
msgstr "hashvärde stämmer inte överens %s"
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr "load_reverse_index: kunde inte öppna paket"
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "kan inte hämta storlek på %s"
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>"
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "kan inte hämta diskanvändning för %s"
msgid "could not write '%s' promisor file"
msgstr "kunde inte skriva kontraktsfilen \"%s\""
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "paketfilen %s kunde inte kopplas%s"
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "flaggan \"%s\" antar ett numeriskt värde"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "trasigt utlöpsdatum: \"%s\""
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\""
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "menade du \"--%s\" (med två bindestreck)?"
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "alias för --%s"
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "okänd flagga \"%s\""
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "okänd flagga \"%c\""
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " eller: %s"
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr "%*s%s"
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-TAL"
msgid "the remote end hung up unexpectedly"
msgstr "fjärren lade på oväntat"
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokollfel: felaktig radlängdstecken: %.4s"
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokollfel: felaktig radlängd: %d"
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
msgid "could not read `log` output"
msgstr "kunde inte läsa utdata från \"log\""
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%s\""
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only och --right-only är ömsesidigt uteslutande"
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "kunde inte tolka loggen för \"%s\""
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr "kan inte skapa tom blob i objektdatabasen"
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "\"%s\" har inte någon utcheckad incheckning"
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr "kan inte indexera filen \"%s\""
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr "kan inte lägga till \"%s\" till indexet"
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "\"%s\" finns både som en fil och en katalog"
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr "Uppdatera indexet"
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr "felaktig signatur 0x%08x"
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr "felaktig indexversion %d"
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr "felaktig sha1-signatur för indexfil"
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorerar filtillägget %.4s"
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "okänt format 0x%08x på indexpost"
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr "osorterade köposter i index"
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "flera köposter för den sammanslagna filen \"%s\""
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "osorterade köposter för \"%s\""
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "kunde inte skapa tråd för load_cache_entries: %s"
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr "%s: öppning av indexfilen misslyckades"
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: kan inte ta startus på det öppna indexet"
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indexfilen mindre än förväntat"
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: kan inte koppla indexfilen%s"
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "kunde inte skapa load_index_extensions-tråden: %s"
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "kunde inte uppdatera delat index \"%s\""
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "trasigt index, förväntade %s i %s, fick %s"
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr "misslyckades omvandla till glest index"
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "kan inte rätta behörighetsbitar på \"%s\""
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: kan inte återgå till kö 0"
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr "%s: \"preserve\" har ersatts av \"merges\""
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr "försvunnen"
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) tar inte argument"
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "okänt %%(objectsize)-argument: %s"
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "okänt %%(subject)-argument: %s"
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "okänt %%(contents)-argument: %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "okänt %%(raw)-argument: %s"
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "positivt värde förväntat \"%s\" i %%(%s)"
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "okänt argument \"%s\" i %%(%s)"
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "okänt %%(align)-argument: %s"
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "okänt %%(if)-argument: %s"
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
msgstr ""
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom"
#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr "flaggan \"%s\" måste peka på en incheckning"
msgid "invalid branch name: %s = %s"
msgstr "felaktigt namn på gren: %s = %s"
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorerar dinglande symbolisk referens %s"
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "loggen för referensen %s har lucka efter %s"
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "loggen för referensen %s slutade oväntat på %s"
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr "loggen för %s är tom"
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s"
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr "referensuppdateringar avbrutna av krok"
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\""
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
msgid "invalid refspec '%s'"
msgstr "felaktig referensspecifikation: \"%s\""
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "mer än en receivepack angavs, använder den första"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "mer än en uploadpack angavs, använder den första"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kan inte hämta både %s och %s till %s"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr "käll-referensspecifikationen %s motsvarar ingen"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr "käll-referensspecifikationen %s motsvarar mer än en"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"\n"
"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Var det meningen att skapa en ny gren genom att sända\n"
"till \"%s:refs/heads/%s\"?"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Var det meningen att skapa en ny tagg genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Var det meningen att tagga ett nytt träd genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Var det meningen att tagga en ny blob genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kan inte slås upp till en gren"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Kunde inte hitta fjärr-referensen %s"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignorerar märklig referens \"%s\" lokalt"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (använd \"%s\" för detaljer)\n"
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "kan inte tolka förväntat objektnamn \"%s\""
msgid "there were errors while writing '%s' (%s)"
msgstr "fel vid skrivning av \"%s\" (%s)"
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "misslyckades spola \"%s\""
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
msgid "could not determine HEAD revision"
msgstr "kunde inte bestämma HEAD-revision"
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "kunde inte hitta trädet för %s."
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input är inkompatibelt med --no-walk"
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<paketfil> stöds inte längre"
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk är inkompatibelt med --unsorted-input"
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L stöder ännu inte andra diff-format än -p och -s"
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "kan inte skapa asynkron tråd: %s"
msgid "could not delete '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
"För att avbryta och återgå till där du var före \"git revert\",\n"
"kör \"git revert --abort\"."
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
msgid "unable to dequote value of '%s'"
msgstr "kan inte ta bort citering av värdet \"%s\""
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s är inte en incheckning!"
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr "kunde inte tolka incheckningens författare"
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr "ogiltig författar-identitet \"%s\""
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr "trasig författare: saknar datuminformation"
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr "avbryter pågående \"cherry-pick\""
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr "avbryter pågående \"revert\""
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: \"%s\""
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr "en \"revert\" pågår redan"
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr "en \"cherry-pick\" pågår redan"
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr "ingen \"revers\" pågår"
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr "ingen \"cherry-pick\" pågår"
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr "kunde inte hoppa över incheckningen"
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr "ingenting att hoppa över"
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"har du redan checkat in?\n"
"testa \"git %s --continue\""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr "Kunde inte slå ihop %.*s"
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr "Kör: %s\n"
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr "skriver squash-onto"
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Oväntat svar från stash: \"%s\""
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Kunde inte skapa katalog för \"%s\""
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr "Skapade autostash: %s\n"
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr "kunde inte utföra \"reset --hard\""
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr "Tillämpning av autostash gav konflikter."
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash finns; skapar ny stash-post."
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Ombaserar (%d/%d)%s"
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Lyckades ombasera och uppdatera %s.\n"
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continue\" igen."
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr "hoppade över tidigare applicerad incheckning %s"
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar"
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "\"%s\" är utanför arkivet på \"%s\""
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "funktionen måste köras i en arbetskatalog"
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "okänd arkivutökning hittades:"
msgstr[1] "okända arkivutökningar hittades:"
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"
msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr "fel vid öppning av \"%s\""
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "för stor för att vara en .git-fil: \"%s\""
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr "fel vid läsning av %s"
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr "ogiltigt gitfilformat: %s"
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr "ingen sökväg i gitfil: %s"
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr "inte ett git-arkiv: %s"
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr "\"$%s\" för stor"
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr "inte ett git-arkiv: \"%s\""
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr "kan inte byta katalog (chdir) till \"%s\""
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "misslyckades ta status på \"%*ss%s%s\""
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr "kan inte byta till \"%s\""
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr "\"fork\" misslyckades"
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr "\"setsid\" misslyckades"
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "indexposten är en katalog, men inte gles (%08x)"
msgstr[0] "%u byte/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr "kunde inte redigera \"%s\""
msgid "process for submodule '%s' failed"
msgstr "process för undermodulen \"%s\" misslyckades"
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst"
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet"
msgid "Aborting."
msgstr "Avbryter."
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr "kunde inte sända alla nödvändiga undermoduler"
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"dem:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Vägrar ta bort aktuell arbetskatalog:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"mönster:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"gles-mönster:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna "
"ovan.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Uppdaterar filer"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
"kollisionsgrupp finns i arbetskatalogen:\n"
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr "Uppdaterar indexflaggor"
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "förväntade \"flush\" efter \"fetch\"-argument"
msgid "Fetching objects"
msgstr "Hämtar objekt"
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "\"%s\" är inte en .git-fil, felkod %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "inte en katalog"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ".git är inte en fil"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr ".git-filen är trasig"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr ".git-filen är felaktig"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "inte en giltig sökväg"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "hittar inte arkivet; .git är inte en fil"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "hittar inte arkivet; .git-filen är trasig"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "gitdir är oläsbar"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "gitdir är felaktig"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "inte i en giltig katalog"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "gitdir-filen existerar inte"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "kunde inte läsa gitdir-filen (%s)"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "ogiltig gitdir-fil"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "gitdir-filen pekar på en ickeexisterande plats"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Stashen innehåller just nu %d post"
msgstr[1] "Stashen innehåller just nu %d poster"
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Raden ovan får inte ändras eller tas bort.\n"
"Allt under den kommer tas bort."
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"Det tog %.2f sekunder att räkna före/bakom-värden.\n"
"Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (använd \"git am --allow-empty\" för att registrera patchen som en tom "
+"incheckning)"
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick pågår."
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)"
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)"
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "Ångring pågår."
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " (kör \"git revert --continue\" för att fortsätta)"
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (använd \"git revert --skip\" för att hoppa över patchen)"
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "Du är i en gles utcheckning."
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "olika"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "efter "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "kunde inte sända IPC-kommando"
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "kunde inte läsa IPC-svar"
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "kunde inte ta status \"accept_thread\" \"%s\""
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "kunde inte starta \"worker[0]\" för \"%s\""
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "var pratsam"
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr "tillåt uppdatera poster utanför området angivet i \"sparse-checkout\""
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "bakända för \"git stash -p\""
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Se \"git help submodule\" för ytterligare information."
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"Slå av detta meddelande med\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file är inkompatibelt med --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A och -u är ömsesidigt inkompatibla"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "\"--chmod\"-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul kräver --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "\"%s\" kan inte användas tillsammans med sökvägsangivelser"
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"Slå av detta meddelande genom att köra\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Felaktigt värde för --empty: %s"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"För att registrera den tomma patchen som en tom incheckning, kör \"%s --"
+"allow-empty\"."
+
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1224
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Patchen är tom."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "saknad \"author\"-rad i incheckningen %s"
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Hoppar över: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Skapar en tom incheckningar: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Patchen är tom."
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Använd \"git am --show-current-patch=diff\" för att se patchen som "
"misslyckades"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Inga ändringar - sparat som en tom incheckning."
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"lösta.\n"
"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\"."
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Felaktigt värde för --show-current-patch: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "flaggorna \"%s=%s\" och \"%s=%s\" kan inte användas samtidigt"
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet"
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "sänd det genom git-mailinfo"
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr "n"
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr "återställ originalgrenen och avbryt patchningen"
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr "avbryt patchningen men behåll HEAD där det är"
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "visa patchen som tillämpas"
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "lagra den tomma patchen som en tom incheckning"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "hantering av tomma patchar"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "interaktivt läge kräver patchar på kommandoraden"
msgid "show work cost statistics"
msgstr "visa statistik över arbetskostnad"
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
msgid "ignore whitespace differences"
msgstr "ignorera ändringar i blanksteg"
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "incheckning"
msgstr ""
"behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "Klandra rader"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<flaggor>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "kunde inte slå upp HEAD"
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pekar utenför refs/heads/"
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "ställ in spårningsläge (se git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "ställ in inställningar för spårad gren"
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "ta bort uppströmsinformationen"
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "visa namn på aktuell gren"
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column och --verbose är inkompatibla"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n"
"Menade du att använda: -a|-r --list <mönster>?"
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
msgstr "git checkout--worker [<flaggor>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr "sträng"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Återskapade %d sammanslagningskonflikt"
msgstr[1] "Återskapade %d sammanslagningskonflikter"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "Uppdaterade %d sökväg från %s"
msgstr[1] "Uppdaterade %d sökvägar från %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "Uppdaterade %d sökväg från indexet"
msgstr[1] "Uppdaterade %d sökvägar från indexet"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "\"%s\" kan inte användas med %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "varken \"%s\" eller \"%s\" har angivits"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "\"%s\" måste användas när \"%s\" inte anges"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"kan inte fortsätta med köade ändringar i följande filer:\n"
"%s"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
"Använd -- (och möjligen --no-guess) för att göra otvetydig"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
"checkout.defaultRemote=origin i din konfiguration."
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "endast en referens förväntades"
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "förväntade gren, fick taggen \"%s\""
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "förväntade gren, fick fjärrgrenen \"%s\""
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "förväntade gren, fick \"%s\""
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "förväntade gren, fick incheckningen \"%s\""
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"kan inte växla gren vid sammanslagning\n"
"Överväg \"git merge --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"kan inte växla gren mitt i en \"am\"-körning\n"
"Överväg \"git am --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"kan inte växla gren vid ombasering\n"
"Överväg \"git rebase --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"kan inte växla gren i en \"cherry-pick\"\n"
"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"kan inte växla gren i en \"revert\"\n"
"Överväg \"git revert --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "då växlar grenar medan du gör en \"bisect\""
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "\"%s\" kan inte ta <startpunkt>"
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "saknar gren- eller incheckingsargument"
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "konfliktstil (merge eller diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "konfliktstil (merge, diff3 eller zdiff3)"
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "sätt uppströmsinformation för ny gren"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "flaggorna \"%-c\", \"-%c\" och \"%s\" kan inte användas samtidigt"
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p och --overlay är ömsesidigt uteslutande"
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "grennamn saknas; försök med -%c"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "kunde inte upplösa %s"
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file är inkompatibelt med --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file är inkompatibelt med --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "du måste ange katalog(er) att återställa"
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "använd överläggsläge (standard)"
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "skapa och växla till en ny gren"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "skapa/nollställ och växla till en gren"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "kasta bort lokala ändringar"
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "vilken träd-igt att checka ut från"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "återställ indexet"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "återställ arbetskatalogen (förval)"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "ignorera ej sammanslagna poster"
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "använd överläggsläge"
msgid "could not lstat %s\n"
msgstr "kunde inte ta status (\"lstat\") på %s\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Vägrar ta bort aktuell arbetskatalog\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Skulle vägra ta bort aktuell arbetskatalog\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "namn"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr "djup"
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr "tid"
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
-msgstr ""
-"inget att checka in\n"
-"flagga att sända"
+msgstr "flagga att sända"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
-msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
+msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten"
#: builtin/clone.c:231
#, c-format
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "flaggorna --bare och --origin %s är inkompatibla."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt"
#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>"
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr "kat"
msgid "Collecting commits from input"
msgstr "Hämtar incheckningar från indata"
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "okänt underkommando: %s"
msgid "duplicate parent %s ignored"
msgstr "duplicerad förälder %s ignorerades"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "objektnamnet är inte giltigt: %s"
msgid "id of a parent commit object"
msgstr "id på ett förälderincheckningsobjekt"
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr "meddelande"
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "incheckningsmeddelande"
msgid "read commit log message from file"
msgstr "läs incheckningsloggmeddelande från fil"
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file med -a ger ingen mening"
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "kan inte kombinera -m med --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s:%s\" kan inte användas samtidigt"
#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long och -z är inkompatibla"
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera."
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
-"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
+"reword-flaggan till \"%s\" och sökvägen \"%s\" kan inte användas tillsammans"
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
-"interactive/--all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "reword-flaggan till \"%s\" och \"%s\" kan inte användas tillsammans"
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Du är i mitten av en ombasering -- kan inte utöka."
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "okänd flagga: --fixup=%s:%s"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "beräkna fullständiga före-/efter-värden"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr "version"
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "när"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]incheckning"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa/omformulera angiven "
"incheckning"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "släprad"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr "använd skräddarsydd(a) släprad(er)"
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "lägg till Signed-off-by-släprad"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
-msgstr "inkludera status i mallen för incheckningsmeddelandet"
+msgstr "ta med status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long är inkompatibel med --abbrev=0"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
msgid "%s...%s: no merge base"
msgstr "%s...%s: ingen sammanslagningsbas"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: flera sammanslagningsbaser, använder %s"
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "kunde inte läsa symbolisk länk-fil %s"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr "misslyckades: %d"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr "verktyg"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
"låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "sändes till \"diff\""
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool kräver en arbetskatalog eller --no-index"
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff är inkompatibelt med --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges."
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "symbolen för --anonymize-map kan inte vara tom"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "dumpa märken till filen"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "importera märken från filen"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "importera märken från filen, om den finns"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "från:till"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "konvertera <från> till <till> i anonymiserad utdata"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "märk taggar med märke-id"
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map utan --anonymize ger ingen mening"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Saknar från-märken för undermodulen \"%s\""
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Saknar till-märken för undermodulen \"%s\""
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Förväntade \"mark\"-kommando, fick %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Förväntade \"to\"-kommando, fick %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
msgid "Lockfile created but not reported: %s"
msgstr "Låsfil skapad men inte rapporterad: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kan inte vara negativt"
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "ställ in uppström för git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr "använd atomiska transaktioner för att uppdatera referenser"
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "tvinga överskrivning av lokal referens"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"modifiera referensspecifikationen så att alla referenser hamnar i refs/"
"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "kör \"maintenance --auto\" efter hämtning"
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "skriv incheckingsgrafen efter hämtning"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "ta emot referenser från standard in"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Kunde inte hitta fjärr-referensen HEAD"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
+msgstr "kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr "[refuserad]"
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr "utcheckat i en annan arbetskatalog"
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
+"fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
"slagits\n"
-"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
-"\"git config fetch.showForcedUpdates true\"."
+"av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
+"\"git config fetch.showForcedUpdates true\""
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n"
+"det tog %.2f sekunder att se efter tvångsuppdateringar; Du kan använda\n"
"\"--no-show-forced-updates\" eller köra \"git config fetch."
"showForcedUpdates\n"
-"false\" för att undvika testet.\n"
+"false\" för att undvika testet\n"
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\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"
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Flaggan \"%s\" ignoreras för %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr "objektet %s finns inte"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
+"pekar mot någon gren."
+
+#: builtin/fetch.c:1663
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"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr "ställer inte in uppström för en fjärrtag"
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr "okänd grentyp"
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"hittade ingen källgren.\n"
-"du måste ange exakt en gren med flaggan --set-upstream."
+"hittade ingen källgren;\n"
+"du måste ange exakt en gren med flaggan --set-upstream"
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
-msgstr "Kunde inte hämta %s"
+msgid "could not fetch %s"
+msgstr "kunde inte hämta %s"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
-"fjärrarkiv som nya incheckningar ska hämtas från."
+"inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n"
+"fjärrarkiv som nya incheckningar ska hämtas från"
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Du måste ange namnet på en tagg."
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
+msgstr "du måste ange namnet på en tagg"
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negativa djup stöds inte i --deepen"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen och --depth är ömsesidigt uteslutande"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth och --unshallow kan inte användas samtidigt"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
+msgstr "negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Fjärren eller fjärrgruppen finns inte: %s"
+msgid "no such remote or remote group: %s"
+msgstr "fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "kan inte hämta från grupp och ange referensspecifikationer"
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr "måste ange fjärr när --negotiate-only anges"
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokollet stöder inte --negotiate-only, avslutar."
-
#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokollet stöder inte --negotiate-only, avslutar"
+
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone"
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
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"
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
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 ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "fyll i loggen med som mest <n> poster från shortlog"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "använd <namn> istället för den verkliga målgrenen"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "fil att läsa från"
msgstr ""
"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr "använd formatfärger"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "visa endast referenser som pekar på objektet"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "visa endast referenser som slagits samman"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "visa endast referenser som ej slagits samman"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "visa endast referenser som inte innehåller incheckningen"
msgid "%s: object is of unknown type '%s': %s"
msgstr "%s: objektet har okänd typ \"%s\": %s"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objektet kunde inte tolkas: %s"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "ogiltig sha1-fil: %s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Kontrollerar objektkatalog"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Kontrollerar %s-länk"
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pekar på något konstigt (%s)"
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: frånkopplat HEAD pekar på ingenting"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "obs: %s pekar på en ofödd gren (%s)"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Kontrollerar cacheträd"
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: ogiltig sha1-pekare i cacheträd"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "icke-träd i cacheträd"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och supplerande objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: objekt saknas"
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
msgid "failed to parse '%s' value '%s'"
msgstr "misslyckades tolka \"%s\" värde \"%s\""
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "packa om alla paket förutom det största paketet"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "kunde inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "kunde inte tolka värdet %s för prune expiry"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule tillåts inte"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "okänt argument för --schedule, %s"
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "kunde inte skriva incheckningsgraf"
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "kunde inte förhämta fjärrar"
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr "kunde inte starta \"git pack-objects\"-process"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr "kunde inte avsluta \"git pack-objects\"-process"
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "kunde inte skriva multi-pack-index"
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "\"git multi-pack-index expire\" misslyckades"
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "\"git multi-pack-index repack\" misslyckades"
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är "
"inaktiverat"
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "uppgiften \"%s\" misslyckades"
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "\"%s\" är inte en giltig uppgift"
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "kör uppgifter baserad på arkivets tillstånd"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "frekvens"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "kör uppgifter baserat på frekvens"
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "rapportera inte framgång eller annan information över standard fel"
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr "uppgift"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "utför en specifik uppgift"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "använd som mest en av --auto och --schedule=<frekvens>"
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "misslyckades köra \"git config\""
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "misslyckades expandera sökvägen \"%s\""
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "misslyckades starta launchctl"
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "misslyckades skapa kataloger för \"%s\""
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "misslyckades starta tjänsten %s"
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "misslyckades skapa temporär xml-fil"
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "misslyckades starta schtasks"
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\""
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\""
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "misslyckades öppna standard in för \"crontab\""
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "\"crontab\" dog"
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr "misslyckades starta systemctl"
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr "misslyckades att köra systemctl"
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr "okänt argument för --scheduler, \"%s\""
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr "varken systemd-timer eller crontab är tillgänglig"
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr "%s-schemaläggare är inte tillgänglig"
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "en annan process schemalägger bakgrundsunderhåll"
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr "git maintenance start [--scheduler=<schemaläggare>]"
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr "schemaläggare"
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr "schemaläggare som utlöser \"git maintenance\"-körning"
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "misslyckades lägga till arkiv till global konfiguration"
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <underkommando> [<flaggor>]"
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "felaktigt underkommando: %s"
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: \"%s\""
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "felaktig alias.%s-sträng: %s"
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr "flaggan tar inte några andra argument"
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "\"git help config\" för mer information"
msgid "unknown hash algorithm '%s'"
msgstr "okänd hashningsalgoritm \"%s\""
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kan inte användas med --stdin"
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kan inte användas med --stdin"
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
msgid "specify the hash algorithm to use"
msgstr "ange hashningsalgoritm att använda"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "kunde inte läsa objektet %s"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "okänd typ: %d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: ogiltigt omslag från beskrivningsläge"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "kan inte öppna patchfilen %s"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "behöver precis ett intervall"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "inte ett intervall"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "misslyckades skapa fil för omslagsbrev"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "två utdatakataloger?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "okänd incheckning %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "misslyckades slå upp \"%s\" som en giltig referens"
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr "antal iterationer"
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "maximal längd för utdatafilnamn"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "cover-from-description-läge"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "epost"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "procent som skapelse vägs med"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff mot v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor kräver --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "Intervall-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "Intervall-diff mot v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "misslyckades skapa utdatafiler"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr "läs exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "visa felsökningsutdata"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "undertyck dublettposter"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "visa glesa kataloger när et glest index existerar"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
#: builtin/ls-tree.c:136
msgid "include object size"
-msgstr "inkludera objektstorlek"
+msgstr "ta med objektstorlek"
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "använd diff3-baserad sammanslagning"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "använd nitisk diff3-baserad sammanslagning"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "för konflikter, använd vår version"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "för konflikter, använd deras version"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "för konflikter, använd en förenad version"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "för konflikter, använd denna markörstorlek"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "varna inte om konflikter"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "flaggan \"%s\" behöver ett värde"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "använd <namn> istället för det verkliga målet"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort men lämna index och arbetskatalog ensamma"
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Redan à jour. (inget att platta till)"
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr "okänd strategiflagga: -X%s"
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"temagren.\n"
"\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "--quit tar inga argument"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Du kan inte kombinera --squash med --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Du kan inte kombinera --squash med --commit."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Använder strategin %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr "taggen på stdin pekar inte på ett giltigt objekt"
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
msgid "refs snapshot for selecting bitmap commits"
msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar"
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr "skriv endast referensbaserade namn (inga objektnamn)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr "ignorera referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
msgid "Write/edit the notes for the following object:"
msgstr "Skriv/redigera anteckningar för följande objekt:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "kunde inte starta \"show\" för objektet \"%s\""
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "kunde inte läsa utdata från \"show\""
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "ange innehåll för anteckningen med antingen -m eller -F"
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "kunde inte skriva anteckningsobjekt"
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr "för många argument"
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
-msgstr "inkludera objekt som kan nås från någon referens"
+msgstr "ta med objekt som kan nås från någon referens"
#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
-msgstr "inkludera objekt som refereras från referensloggposter"
+msgstr "ta med objekt som refereras från referensloggposter"
#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
-msgstr "inkludera objekt som refereras från indexet"
+msgstr "ta med objekt som refereras från indexet"
#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
-msgstr "inkludera taggobjekt som refererar objekt som ska packas"
+msgstr "ta med taggobjekt som refererar objekt som ska packas"
#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-"--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr "styr användning av pre-merge-commit- och commit-msg-krokar"
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "utför automatiskt stash/stash pop före och efter"
msgstr "<fjärr>"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "<gren>"
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"Du kan göra detta genom att köra ett av följande kommando innan du\n"
"gör \"pull\" nästa gång: \n"
"\n"
-" git config pull.rebase false # sammanslagning (förvald strategi)\n"
+" git config pull.rebase false # sammanslagning\n"
" git config pull.rebase true # ombasering\n"
" git config pull.ff only # endast snabbspolning\n"
"\n"
"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
"förvalet vid körning.\n"
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr "Kan inte snabbspola till flera grenar."
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr "Måste ange hur avvikande grenar skall förlikas."
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "arkiv"
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
"\n"
" git push <namn>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all och --tags är inkompatibla"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror och --tags är inkompatibla"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all och --mirror är inkompatibla"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "--preserve-merges har ersatts av --rebase-merges"
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
msgstr "--strategy kräver --merge eller --interactive"
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans"
#: builtin/rebase.c:1476
#, c-format
msgstr "ingen sådan gren/incheckning: \"%s\""
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Du måste ange en katalog."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "du måste ange en katalog"
#: builtin/reflog.c:17
msgid ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists <referens>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "Markerar nåbara objekt..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "%s pekar ingenstans!"
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "ingen referenslogg att ta bort angavs"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "inte en referenslogg: %s"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "ingen referenslogg för \"%s\""
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "felaktigt referensformat: %s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
msgid "Updating %s"
msgstr "Uppdaterar %s"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Kunde inte hämta %s"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
msgid "could not start pack-objects to repack promisor objects"
msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects."
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "kunde inte öppna indexet för %s"
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "paketet %s för stort för att tas med i geometriskt förlopp"
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "paketet %s för stort att rulla upp"
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "kunde inte öppna temporär fil %s för skrivning"
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild"
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "hitta ett geometrisk förlopp med faktor <N>"
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr "skriv ett flerpaketsindex för de skapade paketen"
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric är inkompatibel med -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "Inget nytt att packa."
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "nödvändig fil saknas: %s"
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "kunde inte ta bort: \"%s\""
msgid "unable to open %s for reading"
msgstr "kan inte öppna %s för läsning"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "kan inte starta mktree"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "kan inte läsa från mktree"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree rapporterade misslyckande"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree returnerade inte ett objektnamn"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "kan inte utföra \"fstat\" på %s"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "kan inte skriva objektet till databasen"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "objektnamnet är inte giltigt: \"%s\""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "kan inte läsa objekttyp för %s"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "misslyckades redigera objektfilen"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "nytt objekt är samma som det gamla: \"%s\""
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "kunde inte tolka %s som incheckning"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "ympning för \"%s\" behövs inte"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "ny incheckning är samma som den gamla: \"%s\""
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"kunde inte konvertera följande ympning(ar):\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "konvertera befintlig ympningsfil"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "använd detta format"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format kan inte användas utanför listning"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f kan endast användas vid skrivning av ersättning"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw kan bara användas med --edit"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d behöver minst ett argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "fel antal argument"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e tar exakt ett argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g tar minst ett argument"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file tar inga argument"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "endast ett mönster kan anges med -l"
msgid "unable to generate diff for '%s'"
msgstr "misslyckades skapa diff för \"%s\""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "blandad"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "mjuk"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "hård"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "sammanslagning"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta trädet för HEAD."
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta trädet för %s."
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s återställning tillåts inte i ett naket arkiv"
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N kan endast användas med --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"konfigurationsvariabeln\n"
"reset.quiet till true för att göra detta till förval.\n"
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "objektfiltrering kräver --objects"
msgstr "rev-list stöder inte visning av anteckningar"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "markerad räkning är inkompatibelt med --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "markerad räkning och \"%s\" kan inte användas samtidigt."
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
#: builtin/show-branch.c:655
msgid "include the current branch"
-msgstr "inkludera aktuell gren"
+msgstr "ta med aktuell gren"
#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
-"base"
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
msgid "no such ref %s"
msgstr "ingen sådan referens %s"
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "kan inte hantera mer än %d revision."
msgstr[1] "kan inte hantera mer än %d revisioner."
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "\"%s\" är inte en giltig referens."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "hittar inte incheckning %s (%s)"
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "arbetskatalogen är inte gren"
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i "
"\"sparse-checkout\""
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr "misslyckades ta bort katalogen \"%s\""
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "misslyckades ändra inställning för sparse-index"
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr "initiera sparse-checkout i konläge"
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr "slå på/av använding av glest index"
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "misslyckades ändra inställning för sparse-index"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr "kunde inte normalisera sökvägen \"%s\""
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "kan inte ta bort citering av C-sträng \"%s\""
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "befintliga filter för gles utcheckning använder inte konläge"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <mönster>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
msgid "read patterns from standard in"
msgstr "läs mönster från standard in"
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "ingen sparse-checkout att utöka"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<mönster>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"måste vara i en gles utcheckning för att tillämpa gleshetsmönster på nytt"
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr "fel vid uppdatering av arbetskatalog"
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
" [--] [<sökväg>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<meddelande>]"
#: builtin/stash.c:55
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits upp ur \"stash\":en"
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr "kunde inte återställa ospårade filer från stash-post"
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "försök återskapa indexet"
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "Kastade %s (%s)"
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Kunde inte kasta \"stash\"-post"
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "\"%s\" är inte en \"stash\"-referens"
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr "Stash-posten behålls ifall du behöver den igen."
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "misslyckades tolka träd"
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "misslyckades packa upp träd"
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "visa bara ospårade filer i \"stash\""
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kan inte uppdatera %s med %s"
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "\"stash\"-meddelande"
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Inga köade ändringar"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Kan inte spara aktuellt tillstånd kö"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Kan inte använda --staged och --include-untracked eller --all samtidigt"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "Glömde du använda \"git add\"?"
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Sparade arbetskatalogen och indexstatus %s"
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "behåll indexet"
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "stash:a endast köade ändringar"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "\"stash\" i \"patch\"-läge"
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "tyst läge"
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "ta med ignorerade filer"
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
"officiella uppström."
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
msgid "failed to recurse into submodule '%s'"
msgstr "misslyckades rekursera in i undermodulen \"%s\""
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "hindra statusutskrift för undermodul"
msgid "could not fetch a revision for HEAD"
msgstr "kunde inte hämta en version för HEAD"
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached och --files är ömsesidigt uteslutande"
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
-"\" om du verkligen vill ta bort den och all dess historik)"
+"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog. Denna kommer "
+"ersättas med en .git-fil med absorbgitdirs."
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
"dem"
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Rensade katalogen \"%s\"\n"
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "kunde inte skapa tom undermodulskatalog %s"
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "avregistrera alla undermoduler"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
"med \"--reference-if-able\" istället för \"--reference\"."
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr "katalogen inte tom: \"%s\""
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen ska klonas till"
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "förhindra kloning till icke-tom katalog"
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
"path <sökväg>"
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "Kan inte checka ut \"%s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "Kan inte ombasera \"%s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "Kan inte slå ihop \"%s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "Misslyckades köra \"%s %s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n"
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n"
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n"
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n"
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr "Kan inte hämta i undermodulsökväg \"%s\"; försökte hämta %s direkt:"
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt "
"hämtning av incheckningen misslyckades."
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen ska följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{"
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr "tvinga utcheckningsuppdateringar"
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr "hämta inte nya objekt från fjärrplatsen"
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr "överstyr uppdateringsläge om arkviet är en färsk klon"
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr "djup för grund hämtning"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr "sha1"
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr "SHA1 förväntades av överprojekt{"
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr "subsha1"
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr "SHA1 för undermodulens \"HEAD\""
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr "se om det är säkert att skriva till .gitmodules-filen"
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr "ta bort konfigurationen från .gitmodules-filen"
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <namn> [<värde>]"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <namn>"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "se till att .gitmodules finns i arbetskatalogen"
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "dölj utdata från inställning av url för undermodul"
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "välj master som förvald spårad gren"
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "välj förvald spårad gren"
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "--branch eller --default krävs"
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch och --default är ömsesidigt uteslutande"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n"
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv"
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):\n"
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
"flaggan \"--name\"."
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n"
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Kan inte checka ut undermodulen \"%s\""
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "Misslyckades lägga till undermodulen \"%s\""
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "Misslyckades registrera undermodulen \"%s\""
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr "\"%s\" finns redan i indexet"
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "\"%s\" finns redan i indexet och är inte en undermodul"
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr "gren från arkivet att lägga till som undermodul"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr "visa endast felmeddelanden"
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr "låna objekt från referensarkiv"
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
"sätter undermodulens namn till den angivna strängen istället för att använda "
"sökvägen"
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]"
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../"
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "\"%s\" är inte ett giltigt namn på undermodul"
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column och -n är inkompatibla"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "Flaggan -n är endast tillåten i listläge"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "Flaggan --contains är endast tillåten i listläge"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "Flaggan --no-contains är endast tillåten i listläge"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "Flaggan --points-at är endast tillåten i listläge"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "endast en av flaggorna -F eller -m tillåts."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "flaggan \"%s\" är endast tillåten i listläge"
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
msgid "initializing"
msgstr "initierar"
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason kräver --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr "lagt till med --lock"
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track kan endast användas när ny gran skapas"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr "visa utökade annoteringar och grunder, om tillgängliga"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"kan inte flytta en låst arbetskatalog;\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "misslyckades köra \"git status\" på \"%s\""
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta "
"bort det"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"kan inte ta bort en låst arbetskatalog;\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr "reparera: %s: %s"
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr "fel: %s: %s"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
"See \"git help git\" för en översikt över systemet."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "ingen katalog angavs för --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "ingen katalog angavs för flaggan \"%s\"\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "ingen namnrymd angavs för --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "ingen katalog angavs för --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr "ingen konfigurationsnyckel angavs för --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "ingen katalog angavs för -C\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr "rekursivt alias: %s"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "skrivfel på standard ut"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "okänt skrivfel på standard ut"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "stäng misslyckades på standard ut"
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "kan inte hantera %s som inbyggd"
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"användning: %s\n"
"\n"
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "misslyckades köra kommandot \"%s\": %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "inte ett git-arkiv"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile kräver --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args kan endast användas med --packfile"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "flaggor som inte hanterats"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: okänt kommando \"%s\" från git"
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "ingen kompilatorinformation tillgänglig\n"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "behöver en arbetskatalog"
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "ingen libc-information tillgänglig\n"
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "kunde inte hitta enrolleringsroten"
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr "argument"
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "kunde inte växla till \"%s\""
-#: list-objects-filter-options.h:95
-msgid "object filtering"
-msgstr "objektfiltrering"
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "kunde inte ställa in %s=%s"
-#: parse-options.h:183
-msgid "expiry-date"
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "kunde inte ställa in log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar-enrolleringar kräver en arbetskatalog"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD hos fjärren är inte en gren: \"%.*s\""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "misslyckades hämta namn på standardgren"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "misslyckades avregistrera arkivet"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "misslyckades ta bort enrolleringskatalogen"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "gren att checka ut efter kloning"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "skapa komplett arbetskatalog vid kloning"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "hämta endast metadata för grenen som skall checkas ut"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "Kan inte härleda arbetsträdsnamn från \"%s\""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "katalogen \"%s\" finns redan"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "misslyckades hämta standardgren för \"%s\""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "kunde inte ställa in fjärr i \"%s\""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "kunde inte ställa in \"%s\""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "delvis klon misslyckades; försöker med fullständig klon"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "kunde inte ställa in för komplett klon"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "\"scalar list\" tar inte argument"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrollering>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "konfigurera alla registrerade enrolleringar på nytt"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enrollering>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all eller <enrollering>, men inte bägge"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git-arkiv försvunnet i \"%s\""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <uppgift> [<enrollering>]\n"
+"Uppgifter:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "okänd uppgift: \"%s\""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrollering>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrollering>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "vägrar ta bort aktuell arbetskatalog"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "ta med Git-version"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "ta med Gits byggflaggor"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <kommando> [<flaggor>]\n"
+"\n"
+"Kommandon:\n"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "ingen kompilatorinformation tillgänglig\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "ingen libc-information tillgänglig\n"
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr "argument"
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
+msgstr "objektfiltrering"
+
+#: parse-options.h:183
+msgid "expiry-date"
msgstr "giltig-till"
#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr "använd <n> siffror för att visa objektnamn"
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr "läs sökvägsangivelse från fil"
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr "nyckel"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
msgstr "Visa kanoniska namn och e-postadresser för kontakter"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Se till att referensen är välformad"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Kopiera filer från indexet till arbetskatalogen"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Se till att referensen är välformad"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
"Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Bläddraren för Git-arkiv"
-
-#: command-list.h:117
msgid "Show commit logs"
msgstr "Visa incheckningsloggar"
-#: command-list.h:118
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "Visa information om filer i indexet och arbetskatalogen"
-#: command-list.h:119
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Lista referenser i ett fjärrarkiv"
-#: command-list.h:120
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Visa innehållet i ett trädobjekt"
-#: command-list.h:121
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"
-#: command-list.h:122
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Enkelt program för att dela en UNIX mbox"
-#: command-list.h:123
+#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "Utför uppgifter för att optimera Git-arkivdata"
-#: command-list.h:124
+#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "Slå ihop två eller flera utvecklingshistorier"
-#: command-list.h:125
+#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "Hitta en så bra anfader som möjligt för sammanslagning"
-#: command-list.h:126
+#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "Kör en trevägs-filsammanslagning"
-#: command-list.h:127
+#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "Kör en sammanslagning för filer som behöver det"
-#: command-list.h:128
+#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Visa trevägssammanslagning utan att röra indexet"
+
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Visa trevägssammanslagning utan att röra indexet"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Skriv och verifiera multi-pack-index"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "skapar ett taggobjekt med extra validering"
-#: command-list.h:133
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Skriv och verifiera multi-pack-index"
+
+#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
-#: command-list.h:135
+#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "Hitta symboliska namn för givna referenser"
-#: command-list.h:136
+#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "Lägg till eller inspektera objektanteckningar"
-#: command-list.h:137
+#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "Importera från eller sänd till Perforce-arkiv"
-#: command-list.h:138
+#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "Skapa ett packat arkiv med objekt"
-#: command-list.h:139
+#: command-list.h:138
msgid "Find redundant pack files"
msgstr "Hitta redundanta pack-filer"
-#: command-list.h:140
+#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
-#: command-list.h:141
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Beräkna unik ID för en patch"
-#: command-list.h:142
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "Ta bort alla onåbara objekt från objektdatabasen"
-#: command-list.h:143
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Ta bort extraobjekt som redan finns i pack-filerna"
-#: command-list.h:144
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"
-#: command-list.h:145
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
-#: command-list.h:146
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"
-#: command-list.h:147
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)"
-#: command-list.h:148
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Läser trädinformation in i indexet"
-#: command-list.h:149
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"
-#: command-list.h:150
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Ta emot det som sänds till arkivet"
-#: command-list.h:151
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Hantera referenslogg-information"
-#: command-list.h:152
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Hantera uppsättningen spårade arkiv"
-#: command-list.h:153
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Packa opackade objekt i ett arkiv"
-#: command-list.h:154
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"
-#: command-list.h:155
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Skapar en sammanfattning av väntande ändringar"
-#: command-list.h:156
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
-#: command-list.h:157
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Återställ aktuell HEAD till angivet tillstånd"
-#: command-list.h:158
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Återställ filer i arbetskatalogen"
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Återställ några befintliga incheckningar"
-
-#: command-list.h:160
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
-#: command-list.h:161
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Plocka ut och massera parametrar"
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Återställ några befintliga incheckningar"
+
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Ta bort filer från arbetskatalogen och från indexet"
-#: command-list.h:163
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Sänd en uppsättning patchar som e-post"
-#: command-list.h:164
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Sänd objekt över Git-protokollet till annat arkiv"
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Git:s i18n-startkod för skalskript"
+
#: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Gemensam skriptstartkod för Git"
+
+#: command-list.h:166
msgid "Restricted login shell for Git-only SSH access"
msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
-#: command-list.h:166
+#: command-list.h:167
msgid "Summarize 'git log' output"
msgstr "Summera \"git log\"-utdata"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show various types of objects"
msgstr "Visa olika sorters objekt"
-#: command-list.h:168
+#: command-list.h:169
msgid "Show branches and their commits"
msgstr "Visa grenar och deras incheckningar"
-#: command-list.h:169
+#: command-list.h:170
msgid "Show packed archive index"
msgstr "Skapa packat arkivindex"
-#: command-list.h:170
+#: command-list.h:171
msgid "List references in a local repository"
msgstr "Visa referenser i ett lokalt arkiv"
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Git:s i18n-startkod för skalskript"
-
#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Gemensam skriptstartkod för Git"
-
-#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Initiera och modifiera sparse-checkout"
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Lägg filinnehållet till indexet"
+
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Spara undan ändringar i en lortig arbetskatalog"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Lägg filinnehållet till indexet"
-
-#: command-list.h:176
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: command-list.h:177
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Ta bort onödiga blanksteg"
-#: command-list.h:178
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Initiera, uppdatera eller inspektera undermoduler"
-#: command-list.h:179
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
-#: command-list.h:180
+#: command-list.h:179
msgid "Switch branches"
msgstr "Byt gren"
-#: command-list.h:181
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Läs, modifiera eller ta bort symbolisk referens"
-#: command-list.h:182
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
-#: command-list.h:183
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Skapar temporära filer med innehållet från en blob"
-#: command-list.h:184
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Packa upp objekt från ett pakat arkiv"
-#: command-list.h:185
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
-#: command-list.h:186
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
-#: command-list.h:187
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
-#: command-list.h:188
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Sänd arkivet tillbaka till git-archive"
-#: command-list.h:189
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
-#: command-list.h:190
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Visa en logisk Git-variabel"
-#: command-list.h:191
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Kontrollera GPG-signaturer för incheckningar"
-#: command-list.h:192
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Bekräfta packade Git-arkivfiler"
-#: command-list.h:193
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Kontrollera GPG-signaturer i taggar"
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
-
-#: command-list.h:195
+#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr "Visa loggar med differenser varje incheckning introducerar"
-#: command-list.h:196
+#: command-list.h:194
msgid "Manage multiple working trees"
msgstr "Hantera ytterligare arbetskataloger"
-#: command-list.h:197
+#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr "Skapa ett trädobjekt från aktuellt index"
-#: command-list.h:198
+#: command-list.h:196
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: command-list.h:199
+#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr "Gits kommandoradsgränssnitt och -konventioner"
-#: command-list.h:200
+#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr "Grundläggande Git-handledning för utvecklare"
-#: command-list.h:201
+#: command-list.h:199
msgid "Providing usernames and passwords to Git"
msgstr "Tillhandahåll användarnamn och lösenord till Git"
-#: command-list.h:202
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git för CVS-användare"
-#: command-list.h:203
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Justrea diff-utdata"
-#: command-list.h:204
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
-#: command-list.h:205
+#: command-list.h:203
msgid "Frequently asked questions about using Git"
msgstr "Ofta ställda frågor om att använda Git"
-#: command-list.h:206
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "En Git-ordlista"
-#: command-list.h:207
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Krokar som används av Git"
-#: command-list.h:208
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Bläddraren för Git-arkiv"
+
+#: command-list.h:208
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser"
-#: command-list.h:210
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: command-list.h:211
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Git-namnrymder"
-#: command-list.h:212
+#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "Hjälpprogram för att interagera med fjärrarkiv"
-#: command-list.h:213
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Gits arkivlayout"
-#: command-list.h:214
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: command-list.h:215
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Monterar ett arkiv inuti ett annat"
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Introduktion till Git"
+
#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Introduktion till Git: del två"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Introduktion till Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgid "usage: $dashless $USAGE"
msgstr "använd: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Kan inte $action: Du har oköade ändringar."
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Inga andra stycken att gå till\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Inga andra stycken att söka efter\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Beklagar, kan inte dela stycket\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Beklagar, kan inte redigera stycket\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
"kontroll.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
"eller konfigurationsflagga)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "varning: sendmail-raden känns inte igen: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Säga \"./%s\" om du menar en fil; eller\n"
" * Ange flaggan --format-patch om du menar ett intervall.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Sammanfattande brev tomt, hoppar över\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem ska breven sändas (om någon)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
"smtp-debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"ödesdigert: %s:%d är längre än 998 tecken\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "--index outside a repository"
+#~ msgstr "--index utanför arkiv"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached utanför arkiv"
+
+#~ msgid "unrecognized input"
+#~ msgstr "indata känns inte igen"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "kan inte läsa %s"
+
+#~ msgid "Option --exec can only be used together with --remote"
+#~ msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#, c-format
+#~ msgid ""
+#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#~ msgstr ""
+#~ "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
+#~ "ombasering."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#~ msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#~ msgstr ""
+#~ "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
+#~ "ombasering."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s'."
+#~ msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#~ msgstr ""
+#~ "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom "
+#~ "ombasering."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s'."
+#~ msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
+
+#~ msgid "Cannot force update the current branch."
+#~ msgstr "Kan inte tvinga uppdatering av aktuell gren."
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "Objektnamnet är inte giltigt: \"%s\"."
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr ""
+#~ "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr ""
+#~ "-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex "
+#~ "med -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --"
+#~ "pickaxe-all med -G och -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only och --right-only är ömsesidigt uteslutande"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "okänt %%(objectsize)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "okänt %%(subject)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "okänt %%(contents)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "okänt %%(raw)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "okänt argument \"%s\" i %%(%s)"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "okänt %%(align)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "okänt %%(if)-argument: %s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input är inkompatibelt med --no-walk"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk är inkompatibelt med --unsorted-input"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run är inkompatibelt med --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --edit"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A och -u är ömsesidigt inkompatibla"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr ""
+#~ "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr ""
+#~ "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul kräver --pathspec-from-file"
+
+#, c-format
+#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+#~ msgstr ""
+#~ "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column och --verbose är inkompatibla"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "\"%s\" kan inte användas med %s"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr "sätt uppströmsinformation för ny gren"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p och --overlay är ömsesidigt uteslutande"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --detach"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --patch"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "flaggorna --bare och --origin %s är inkompatibla."
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file med -a ger ingen mening"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "kan inte kombinera -m med --fixup:%s"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long och -z är inkompatibla"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr ""
+#~ "kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
+#~ "interactive/--all/--include/--only"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long är inkompatibel med --abbrev=0"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff är inkompatibelt med --no-index"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "--anonymize-map utan --anonymize ger ingen mening"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
+
+#, c-format
+#~ msgid "Refusing to fetch into current branch %s of non-bare repository"
+#~ msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen och --depth är ömsesidigt uteslutande"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth och --unshallow kan inte användas samtidigt"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin kan inte användas med --stdin"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format kan inte användas med --stdin"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n och -k kan inte användas samtidigt"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr ""
+#~ "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor kräver --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "Du kan inte kombinera --squash med --no-ff."
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "Du kan inte kombinera --squash med --commit."
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr ""
+#~ "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete är inkompatibel med --all, --mirror och --tags"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all och --tags är inkompatibla"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror och --tags är inkompatibla"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all och --mirror är inkompatibla"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable och -A kan inte användas samtidigt"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric är inkompatibel med -A, -a"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N kan endast användas med --mixed"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "markerad räkning är inkompatibelt med --objects"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr ""
+#~ "--reflog är inkompatibel med --all, --remotes, --independent eller --"
+#~ "merge-base"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached och --files är ömsesidigt uteslutande"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch och --default är ömsesidigt uteslutande"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column och -n är inkompatibla"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "Flaggan --contains är endast tillåten i listläge"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "Flaggan --no-contains är endast tillåten i listläge"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "Flaggan --points-at är endast tillåten i listläge"
+
+#~ msgid "--merged and --no-merged options are only allowed in list mode"
+#~ msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "endast en av flaggorna -F eller -m tillåts."
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason kräver --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "ingen katalog angavs för --git-dir\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "ingen katalog angavs för --work-tree\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile kräver --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args kan endast användas med --packfile"
+
#~ msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
#~ msgstr "gpg.ssh.defaultKeycommand lyckades men gav inga nycklar: %s %s"
#~ msgid "edit the todo list"
#~ msgstr "redigera attgöra-listan"
-#~ msgid "show the current patch"
-#~ msgstr "visa nuvarande patch"
-
#~ msgid "shorten commit ids in the todo list"
#~ msgstr "förkorta inchecknings-id i todo-listan"
#~ msgid "Cannot store %s"
#~ msgstr "Kan inte spara %s"
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "ställ in filter för gles utcheckning"
-
#~ msgid "disable sparse-checkout"
#~ msgstr "inaktivera gles utcheckning"
#~ msgid "unrecognized verb: %s"
#~ msgstr "okänt verb: %s"
-#~ msgid "option '%s' requires a value"
-#~ msgstr "flaggan \"%s\" behöver ett värde"
-
#~ msgid "could not transform the todo list"
#~ msgstr "kunde inte transformera att göra-listan"
#~ msgid "could not truncate '%s'"
#~ msgstr "kunde inte trunkera \"%s\""
-#~ msgid "could not close %s"
-#~ msgstr "kunde inte stänga %s"
-
#~ msgid "Copied a misnamed branch '%s' away"
#~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""
# Turkish translations for Git
# Git Türkçe çevirileri
-# Copyright (C) 2020-2021 Emir SARI <emir_sari@msn.com>
+# Copyright (C) 2020-2022 Emir SARI <emir_sari@icloud.com>
# This file is distributed under the same license as the Git package.
-# Emir SARI <emir_sari@msn.com>, 2020-2021
+# Emir SARI <emir_sari@icloud.com>, 2020-2022
#
# ######################################################### #
# Git Türkçe kavramlar dizini / Git Turkish Glossary #
msgstr ""
"Project-Id-Version: Git Turkish Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-10 18:00+0300\n"
-"Last-Translator: Emir SARI <emir_sari@msn.com>\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
+"PO-Revision-Date: 2022-01-11 18:00+0300\n"
+"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
msgid "Huh (%s)?"
msgstr "Pardon (%s)?"
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "indeks okunamadı"
msgid "could not stage '%s'"
msgstr "'%s' hazırlanamadı"
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "indeks yazılamadı"
msgid "note: %s is untracked now.\n"
msgstr "not: %s artık izlenmiyor.\n"
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "'%s' yolu için make_cache_entry başarısız oldu"
msgid "ignoring unmerged: %s"
msgstr "birleştirilmeyenler yok sayılıyor: %s"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Değişiklik yok.\n"
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Yama güncellemesi"
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "diff'i gözden geçir"
msgid "(empty) select nothing"
msgstr "(boş) hiçbir şey seçme"
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Komutlar ***"
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Şimdi ne olacak"
msgid "unstaged"
msgstr "hazırlanmamış"
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "yol"
msgid "could not refresh index"
msgstr "indeks yenilenemedi"
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Güle güle.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Ekleme hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? "
"a - bu parçayı ve sonraki tüm parçaları hazırla\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Ekleme zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? "
"a - bu parçayı ve sonraki tüm parçaları zulala\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Ekleme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Ekleme indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? "
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
msgid "The selected hunks do not apply to the index!"
msgstr "Seçili parçalar indekse uygulanamıyor!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Çalışma ağacına yine de uygulansın mı? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Hiçbir şey uygulanmadı.\n"
msgid "No other hunks to goto"
msgstr "Gidilecek başka bir parça yok"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "hangi parçaya gidilsin? "
msgid "No other hunks to search"
msgstr "Aranacak başka parça yok"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "düzenli ifade aransın mı? "
msgid "Exiting because of an unresolved conflict."
msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
msgid "unrecognized whitespace ignore option '%s'"
msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject ve --3way birlikte kullanılamaz."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way bir depo dışında"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index bir depo dışında"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached bir depo dışında"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' bir depo dışında"
#: apply.c:800
#, c-format
#: apply.c:883
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr "yamanın %d. satırında dosya adı bulunamıyor "
+msgstr "yamanın %d. satırında dosya adı bulunamıyor"
#: apply.c:921
#, c-format
msgid "cannot checkout %s"
msgstr "%s çıkışı yapılamıyor"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "%s okunamadı"
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s yolu yeniden adlandırıldı/silindi"
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: indekste bulunmuyor"
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "%s: indeks ile eşleşmiyor"
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "Depo, 3 yönlü birleştirme için gereken ikili nesneye iye değil."
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "'%s' ögesinin geçerli içeriği okunamıyor"
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n"
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "kaldırma yaması dosya içeriğini bırakır"
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "%s: yanlış tür"
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s, %o türüne iye, %o bekleniyordu"
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "geçersiz yol '%s'"
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "%s: indekste halihazırda var"
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: çalışma dizininde halihazırda var"
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor "
+msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "şunun yeni kipi (%o): %s, şunun eski kipi (%o): %s, ile eşleşmiyor"
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: yama uygulanamıyor"
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "%s yaması denetleniyor..."
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız"
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "geçerli HEAD'de olmayan %s için kip değişimi"
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 bilgisi eksik veya yararsız (%s)."
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "%s geçici indekse eklenemedi"
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "geçici indeks şuraya yazılamadı: %s"
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "%s indeksten kaldırılamıyor"
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "%s altmodülü için hasarlı yama"
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor"
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor"
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%s için önbellek girdisi eklenemiyor"
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "'%s' dosyası kapatılıyor"
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' dosyası yazılamıyor, %o kipi"
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s yaması sorunsuzca uygulandı."
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr "iç hata"
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..."
msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..."
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor"
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "%s açılamıyor"
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Parça #%d sorunsuzca uygulandı."
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "Parça %d geri çevrildi."
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "'%s' yaması atlandı."
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "tanımlanamayan girdi"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Girdide geçerli yama yok (\"--allow-empty\" ile izin ver)"
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr "indeks dosyası okunamıyor"
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "'%s' yaması açılamıyor: %s"
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d boşluk hatası susturuldu"
msgstr[1] "%d boşluk hatası susturuldu"
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d satır boşluk hatası ekliyor."
msgstr[1] "%d satır boşluk hatası ekliyor."
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Yeni indeks dosyası yazılamıyor"
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygulama"
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygula"
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "sayı"
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "yamanın yaptığı eklemeleri yok say"
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver"
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr "eklenen ve silinen satırların sayısını onluk birimde göster"
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver"
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak"
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol"
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "çalışma ağacına dokunmadan bir yama uygula"
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et"
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "3 yönlü birleştirme dene, başarısız olursa normal yamaya geri çekil"
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur"
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "yollar NUL karakteri ile ayrılır"
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "en az <n> bağlam satırının eşleştiğinden emin ol"
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr "eylem"
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla"
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr "bağlam bulurken boşluk değişikliklerini yok say"
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "yamayı tersten uygula"
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "en az bir satır bağlam bekleme"
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "üst üste binen parçalara izin ver"
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "ayrıntı ver"
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör"
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "parça üstbilgisindeki satır sayımına güvenme"
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "kök"
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "tüm dosya adlarının başına <kök> ekle"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "boş yamalar için hata döndürme"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "'%s' süzgeci başlatılamıyor"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "açıklayıcı yeniden yönlendirilemiyor"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' süzgeci hata bildirdi"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <depo> [--exec <komut>] --list"
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "%s okunamıyor"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
-msgstr "'%s' okunamadı"
+msgid "cannot read '%s'"
+msgstr "'%s' okunamıyor"
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
msgid "archive format"
msgstr "arşiv biçimi"
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "önek"
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "dosya"
msgstr "desteklenen arşiv biçimlerini listele"
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "depo"
msgid "retrieve the archive from remote repository <repo>"
msgstr "arşivi uzak konum deposu <depo>'dan al"
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr "komut"
msgid "Unexpected option --remote"
msgstr "Beklenmedik seçenek --remote"
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "'%s' seçeneği '%s' gerektiriyor"
#: archive.c:582
msgid "Unexpected option --output"
msgstr "Beklenmedik seçenek --output"
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz"
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr "'%s' dosyası oluşturulamadı"
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' dosyası okunamadı"
"--reverse ve --first-parent birlikte en son işlemenin belirtilmesini "
"gerektiriyor"
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr "%s ikili nesnesi %s yolunda okunamıyor"
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
-"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak "
+"izleme yapılandırması miras alınamıyor"
-#: branch.c:67
+#: branch.c:88
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "%s dalı kendi üst kaynağı olarak ayarlanamaz."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "'%s' dalı kendi üst kaynağı olarak ayarlanamaz"
-#: branch.c:93
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "branch '%s' set up to track '%s' by rebasing."
msgstr ""
-"'%s' dalı '%s' uzak dalını yeniden temellendirme ile %s konumundan izlemek "
-"üzere ayarlandı."
+"'%s' dalı '%s' ögesini yeniden temellendirme ile izlemek üzere ayarlandı."
-#: branch.c:94
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "'%s' dalı '%s' uzak dalını %s konumundan izlemek üzere ayarlandı."
+msgid "branch '%s' set up to track '%s'."
+msgstr "'%s' dalı '%s' ögesini izlemek üzere ayarlandı."
-#: branch.c:98
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"'%s' dalı '%s' yerel dalını yeniden temellendirme ile izlemek üzere ayarlandı"
+msgid "branch '%s' set up to track:"
+msgstr "'%s' dalı şunu izlemek üzere ayarlandı:"
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "'%s' dalı '%s' yerel dalını izlemek üzere ayarlandı."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "üstkaynak dal yapılandırması yazılamıyor"
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"'%s' dalı '%s' uzak başvurusunu yeniden temellendirme ile izlemek üzere "
-"ayarlandı."
+"\n"
+"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
+"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:"
-#: branch.c:105
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "'%s' dalı '%s' uzak başvurusunu izlemek üzere ayarlandı."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
-#: branch.c:109
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr ""
-"'%s' dalı '%s' yerel başvurusunu yeniden temellendirme ile izlemek üzere "
-"ayarlandı."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "'%s' konumundan izleme miras istendi; ancak bir birleştirme "
+"yapılandırması ayarlanmamış"
-#: branch.c:110
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "'%s' dalı '%s' yerel başvurusunu izlemek üzere ayarlandı."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Üstkaynak dal yapılandırması yazılamıyor"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "izlenmiyor: %s başvurusu için belirsiz bilgi"
-#: branch.c:156
+#: branch.c:287
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "İzlenmiyor: %s başvurusu için belirsiz bilgi"
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' geçerli bir dal adı değil"
-#: branch.c:189
+#: branch.c:307
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' geçerli bir dal adı değil."
+msgid "a branch named '%s' already exists"
+msgstr "'%s' adında bir dal halihazırda var"
-#: branch.c:208
+#: branch.c:313
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "'%s' adında bir dal halihazırda var."
+msgid "cannot force update the branch '%s'checked out at '%s'"
+msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Geçerli dal zorla güncellenemiyor."
-
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "İzleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil"
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "istenen üstkaynak dalı '%s' mevcut değil"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"tasarlıyorsanız itme sırasında üstkaynak yapılandırmasını\n"
"da ayarlamak için \"git push -u\" kullanmak isteyebilirsiniz."
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Geçerli bir nesne adı değil: '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "geçerli bir nesne adı değil: '%s'"
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Belirsiz nesne adı: '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "belirsiz nesne adı: '%s'"
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Geçerli bir dal noktası değil: '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "geçerli bir dal noktası değil: '%s'"
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış"
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "%s çalışma ağacının HEAD'i güncellenmemiş"
msgid "unrecognized header: %s%s (%d)"
msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "tanımlanamayan argüman: %s"
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "geçersiz renk değeri: %.*s"
msgid "unable to find all commit-graph files"
msgstr "tüm commit-graph dosyaları bulunamıyor"
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "geçersiz işleme konumu. commit-graph büyük olasılıkla hasar görmüş."
+msgstr "geçersiz işleme konumu, commit-graph büyük olasılıkla hasar görmüş"
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr "%s işlemesi bulunamadı"
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr "%s işlemesi ayrıştırılamıyor"
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "%s nesnesinin türü alınamıyor"
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr "İşleme grafiğindeki işleme imleri temizleniyor"
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr ""
"Geçerli işlemelerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor"
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr "Başvurulmuş işlemeler toplanıyor"
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "%d pakette işleme grafiği için işlemeler bulunuyor"
msgstr[1] "%d pakette işleme grafiği için işlemeler bulunuyor"
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr "%s paketi eklenirken hata"
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr "%s için indeks açılırken hata"
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr "Paketlenmiş nesneler arasından işleme grafiği için işlemeler bulunuyor"
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr "temel grafiği numaralarının doğru sayısı yazılamadı"
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr "%s öncü dizinleri oluşturulamıyor"
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr "geçici grafik katmanı oluşturulamıyor"
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "İşleme grafiği %d geçişte yazılıyor"
msgstr[1] "İşleme grafiği %d geçişte yazılıyor"
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr "commit-graph zincir dosyası açılamıyor"
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr "Birleştirilen işlemeler taranıyor"
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr "commit-graph birleştiriliyor"
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı"
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr "grafik yazımı için çok fazla işleme"
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar "
"görmüş"
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s"
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u"
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı"
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"commit-graph'teki %s işlemesi için olan kök ağaç nesne tanımlayıcısı %s != %s"
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "%s işlemesi için olan commit-graph üst öge listesi çok uzun"
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s için olan commit-graph üst ögesi %s != %s"
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "%s işlemesi için olan commit-graph üst öge listesi erkenden sonlanıyor"
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde "
"sıfırdan farklı"
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka "
"yerlerde sıfır"
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "%s ayrıştırılamadı"
"\"git config advice.graftFileDeprecated false\"\n"
"kullanarak bu iletiyi kapatabilirsiniz."
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"%s işlemesinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s işlemesinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s işlemesinin bir GPG imzası yok."
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s işlemesinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr "anahtar, bir değişken adı içermiyor: %s"
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "geçersiz anahtar: %s"
msgid "invalid mode for object creation: %s"
msgstr "nesne oluşturma için geçersiz kip: %s"
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "%s için hatalı oluşturulmuş değer"
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s için hatalı oluşturulmuş değer: %s"
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "hatalı paket sıkıştırma düzeyi %d"
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr "%s ayrıştırılamadı"
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "komut satırı yapılandırması ayrıştırılamıyor"
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Geçersiz %s: '%s'"
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı"
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor"
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda"
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "geçersiz bölüm adı '%s'"
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "%s birden çok değere iye"
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr "yeni yapılandırma dosyası %s yazılamadı"
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "%s yapılandırma dosyası kilitlenemedi"
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "%s açılıyor"
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "geçersiz dizgi: %s"
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "geçersiz yapılandırma dosyası %s"
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "%s üzerinde fstat başarısız oldu"
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "'%s'%s mmap yapılamıyor"
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "%s üzerinde chmod başarısız oldu"
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "%s yapılandırma dosyası yazılamadı"
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s', '%s' olarak ayarlanamadı"
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' ayarı kapatılamadı"
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "geçersiz bölüm adı: %s"
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "'%s' için değer eksik"
#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
-msgstr "%s adresi aranıyor..."
+msgstr "%s adresi aranıyor ... "
#: connect.c:765
#, c-format
"Connecting to %s (port %s) ... "
msgstr ""
"bitti.\n"
-"%s adresine bağlanılıyor (kapı %s)..."
+"%s adresine bağlanılıyor (kapı %s) ... "
#: connect.c:791 connect.c:868
#, c-format
msgid "unable to fork"
msgstr "çatallanamıyor"
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Bağlantı denetleniyor"
"Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak "
"için --no-index kullanın."
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat kesim yüzdesi '%s' ayrıştırılamadı\n"
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Bilinmeyen dirstat parametresi '%s'\n"
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
"'plain' seçeneklerinden biri olmalıdır"
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte "
"kullanılamaz"
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'"
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
"%s"
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr "dış diff sonlandı, %s konumunda durdu"
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S ve --find-object birlikte kullanılmaz"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile "
-"kullanın"
+#: diff.c:4597
+#, c-format
+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' "
+"ile kullanın"
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve -"
-"S ile kullanın"
+"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' "
+"ve '%s' ile kullanın"
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "geçersiz --stat değeri: %s"
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s bir sayısal değer bekliyor"
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
"%s"
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s"
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s"
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "'%s' çözülemiyor"
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s <n>/<m> biçimi bekliyor"
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s bir karakter bekliyor, '%s' aldı"
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "hatalı --color-moved argümanı: %s"
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws içinde geçersiz kip '%s'"
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
"\"patience\" ve \"histogram\""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "%s için geçersiz argüman"
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "hatalı --word-diff argümanı: %s"
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr "Diff çıktısı biçimlendirme seçenekleri"
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "yama oluştur"
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "diff çıktısını gizle"
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "<n>"
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "diff'leri <n> satır bağlamlı oluştur"
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "diff'i ham biçimde oluştur"
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr "'-p --raw eşanlamlısı"
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "'-p --stat eşanlamlısı"
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "makinede okunabilen --stat"
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "--stat'ın yalnızca son satırını çıktı ver"
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver"
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "--dirstat=cumulative eşanlamlısı"
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat=files,param1,param2... eşanlamlısı"
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar"
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri"
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını göster"
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster"
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr "diffstat oluştur"
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "<genişlik>"
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr "<sayım>"
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "diffstat'ı kısıtlı satırlarla oluştur"
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "diffstat içinde ufak özet oluştur"
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "uygulanabilir bir ikili diff çıktısı ver"
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster"
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr "renkli diff göster"
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr "<çeşit>"
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula"
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
"sonlandırıcıları olarak NUL'ları kullan"
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "<önek>"
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "çıktının her satırının başına ek bir önek ekle"
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "hiçbir kaynak ve hedef önekini gösterme"
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster"
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle"
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle"
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr "Diff yeniden adlandırma seçenekleri"
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır"
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr "yeniden adlandırmaları algıla"
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "silmeler için öngörüntüyü atla"
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr "kopyaları algıla"
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr "yeniden adlandırma algılamasını devre dışı bırak"
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr ""
"bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür"
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
"yeniden adlandırma/kopyalama algılamasını önle"
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "Diff algoritma seçenekleri"
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "olabilecek en küçük diff'i üret"
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "satırları karşılaştırırken boşlukları yok say"
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "boşluk sayısındaki değişiklikleri yok say"
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "satır sonundaki boşluk değişikliklerini yok say"
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "satır sonundaki satırbaşı karakterini yok say"
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "satırlarının tümü boş olan değişiklikleri yok say"
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "<ifade>"
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say"
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır"
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "bir diff algoritması seç"
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr "<metin>"
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "<kip>"
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak "
"göster"
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan"
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>"
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "taşınan kod satırları farklı renklendirilir"
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr "Diğer diff seçenekleri"
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve "
"göreceli yolları göster"
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr "tüm dosyaları metin olarak varsay"
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "iki girdiyi değiştir, diff'i tersine döndür"
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "tüm program çıktısını devre dışı bırak"
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver"
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır"
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr "<ne-zaman>"
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr "<biçim>"
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "indeksten 'git add -N' girdilerini gizle"
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr "<dizi>"
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster"
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle"
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle"
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "<yol>"
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "öncelikle belirtilen yoldaki değişikliği göster"
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "belirtilen yola olan çıktıyı atla"
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr "<nesne-no>"
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr "dosyaları diff türüne göre seç"
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr "<dosya>"
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "belirli bir dosyaya çıktı ver"
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından "
"dolayı atlandı."
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
"Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar "
"bulundu."
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr "'%s' dizini açılamadı"
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr "çekirdek adı ve bilgisi alınamadı"
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Bir dizin adı tahmin edilemedi.\n"
"Lütfen komut satırında bir dizin belirtin."
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr "%s deposundaki indeks dosyası hasarlı"
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr "%s için dizinler oluşturulamadı"
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr "İçerik süzülüyor"
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "hatalı git ad alanı yolu \"%s\""
msgid "too many args to run %s"
msgstr "%s çalıştırmak için çok fazla argüman"
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: sığ bir liste bekleniyordu"
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı"
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "uzak konuma yazılamıyor"
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "geçersiz sığ satır: %s"
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "geçersiz sığ olmayan satır: %s"
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "nesne bulunamadı: %s"
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "nesne içinde hata: %s"
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "sığ bulunamadı: %s"
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s alındı"
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "geçersiz işleme %s"
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr "vazgeçiliyor"
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "bitti"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s alındı"
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "%s tamam olarak imleniyor"
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "%s halihazırda var (%s)"
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "protokol hatası: hatalı paket üstbilgisi"
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s ayrı çatallanamıyor"
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: geçersiz index-pack çıktısı"
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "%s başarısız oldu"
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "yanbant çoğullama çözücüsünde hata"
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "Sunucu sürümü %.*s"
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "Sunucu %s destekliyor"
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "Sunucu sığ istemcileri desteklemiyor"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "Sunucu --shallow-since desteklemiyor"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "Sunucu --shallow-exclude desteklemiyor"
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "Sunucu --deepen desteklemiyor"
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "ortak işleme yok"
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
-msgstr "kaynak depo sığ, klonlama için reddet"
+msgstr "kaynak depo sığ, klonlama için reddet."
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: getirme başarısız"
+msgstr "git fetch-pack: Getirme başarısız."
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
-msgstr "eşleşmeyen algoritmalar: istemci %s; sunucu %s"
+msgstr "eşleşmeyen algoritmalar: İstemci %s; sunucu %s"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "sunucu '%s' algoritmasını desteklemiyor"
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "Sunucu sığ istekleri desteklemiyor"
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "Sunucu süzgeç destekliyor"
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "uzak konuma istek yazılamıyor"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "bölüm üstbilgisi '%s' okunurken hata"
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "beklenmedik alındı satırı: '%s'"
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "alındılar işlenirken hata: %d"
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu"
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr "'ready' \"yok\" iken başka hiçbir bölümün gönderilmemesi gerekiyordu"
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "sığ bilgi işlenirken hata: %d"
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "beklenmedik wanted-ref: '%s'"
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "aranan başvurular işlenirken hata: %d"
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "eşleşen uzak dal ucu yok"
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "uzak konum gereken tüm nesneleri göndermedi"
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "uzak konumdan beklenmedik 'ready'"
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "böyle bir uzak başvuru yok: %s"
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor"
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "geçici dosya oluşturulamadı"
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "şuna ayrık imza yazılamadı: '%s'"
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
"gpg.ssh.allowedSignersFile'ın ssh imza doğrulaması için yapılandırılması ve "
"var olması gerekiyor"
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"ssh-keygen -Y find-principals/verify, ssh imza doğrulaması için gerekli "
"(openssh 8.21p1+ sürümünde mevcut)"
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr "ssh imza geri alım dosyası yapılandırıldı; ancak bulunamadı: %s"
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "hatalı/uyumsuz imza '%s'"
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "'%s' anahtarı için ssh parmak izi alınamadı"
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr ""
"ya user.signingkey ya da gpg.ssh.defaultKeyCommand'in yapılandırılması "
"gerekiyor"
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr ""
"gpg.ssh.defaultKeyCommand başarılı oldu; ancak herhangi bir anahtar "
"döndürmedi: %s %s"
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
msgstr "gpg veriyi imzalayamadı"
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr "user.signingkey'in ssh imzalaması için ayarlanması gerekiyor"
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "ssh imzalama anahtarı arabelleği '%s' konumuna yazılamadı"
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
"ssh-keygen -Y imzası, ssh imzalaması için gerekli (openssh 8.21p1+ sürümünde "
"mevcut)"
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
"PCRE v2 altında -P ile desteklenir"
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %s okunamıyor"
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "'%s': kısa okuma"
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Bunun yerine '%s' çalıştır? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Bunun yerine '%s' çalıştırılsın mı? (y/N)? "
#: help.c:654
#, c-format
msgid "quoted CRLF detected"
msgstr "alıntılanmış CRLF algılandı"
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "hatalı eylem '%s', '%s' için"
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s "
"sürümü (şunun: %s) ağaçta bırakıldı."
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s"
"yazılacak:\n"
"\t%s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "Tümü güncel."
msgid "Could not parse object '%s'"
msgstr "'%s' nesnesi ayrıştırılamadı"
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "İndeks yazılamıyor."
msgid "failed to read the cache"
msgstr "önbellek okunamadı"
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "yeni indeks dosyası yazılamıyor"
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı"
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index dosyası %s pek küçük"
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor"
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index sürümü %d tanımlanamıyor"
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index sağlama sürümü %u, %u sürümü ile eşleşmiyor"
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'"
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "hatalı pack-int-id: %u (%u toplam paket)"
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük"
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr "paket dosyası '%s' eklenemedi"
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "pack-index '%s' açılamadı"
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "%d nesnesi paket dosyasında bulunamadı"
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "ters indeks dosyası depolanamıyor"
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
msgstr "satır ayrıştırılamadı: %s"
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr "hatalı oluşturulmuş satır: %s"
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr "paket yüklenemedi"
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr "%s için indeks açılamadı"
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "bilinmeyen tercih edilen paket: '%s'"
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "bırakılacak pack-file %s görülmedi"
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "tercih edilen '%s' paketinin süresi geçmiş"
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr "indekslenecek paket dosyası yok."
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr "çoklu paket biteşlem yazılamadı"
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr "multi-pack-index yazılamadı"
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "%s kaldırılamadı"
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "multi-pack-index %s konumunda temizlenemedi"
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "yanlış sağlama toplamı"
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "Başvurulmuş paket dosyaları aranıyor"
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "midx bir oid içermiyor"
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "Nesneler paket dosyasına göre sıralanıyor"
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "Nesne ofsetleri doğrulanıyor"
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s"
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "paket dosyası %s için pack-index yüklenemedi"
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "Başvurulmuş nesneler sayılıyor"
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "pack-objects başlatılamadı"
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "pack-objects bitirilemedi"
msgid "Bad %s value: '%s'"
msgstr "Hatalı %s değeri: '%s'"
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin"
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "nesne dizini olağanlaştırılamıyor: %s"
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr "alternatifler dosyası okunamıyor"
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr "yeni alternatifler dosyası yerine taşınamıyor"
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr "'%s' diye bir yol yok"
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor."
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Başvuru deposu '%s' yerel bir depo değil."
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "başvuru deposu '%s' sığ"
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "başvuru deposu '%s' aşılı"
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr "mmap başarısız%s"
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr "nesne dosyası %s boş"
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr "hasar görmüş gevşek nesne '%s'"
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gevşek nesne '%s' sonunda anlamsız veri"
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr "geçersiz nesne türü"
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr "%s üstbilgisi açılamıyor"
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr "%s nesnesi okunamadı"
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s yedeği %s için bulunamadı"
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr "%s dosyası yazılamıyor"
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr "'%s' ögesine izin ayarlanamıyor"
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr "dosya yazım hatası"
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr "gevşek nesne dosyası kapatılırken hata"
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr "geçici dosya oluşturulamıyor"
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr "gevşek nesne dosyası yazılamıyor"
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "yeni nesne %s söndürülemiyor (%d)"
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "%s üzerinde utime() başarısız"
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr "%s için nesne okunamıyor"
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr "hasar görmüş işleme"
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr "hasar görmüş etiket"
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr "%s indekslenirken okuma hatası"
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr "%s indekslenirken kısa read"
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: veritabanına ekleme başarısız"
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: desteklenmeyen dosya türü"
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr "%s geçerli bir nesne değil"
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s geçerli bir '%s' nesnesi değil"
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "%s açılamıyor"
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr "%s mmap yapılamadı"
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr "%s üstbilgisi açılamıyor"
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr "%s içeriği açılamıyor"
msgid "hash mismatch %s"
msgstr "sağlama uyuşmazlığı %s"
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr "load_reverse_index: paket açılamadı"
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "%s boyutu alınamıyor"
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı"
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "%s ögesinin disk kullanımı alınamıyor"
msgid "could not write '%s' promisor file"
msgstr "vaat dosyası '%s' yazılamadı"
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "paket dosyası %s eşlemlenemiyor%s"
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)"
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "'%s' seçeneği sayısal bir değer bekliyor"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "hatalı oluşturulmuş nesne adı '%s'"
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "'%s' seçeneği \"%s\" veya \"%s\" bekliyor"
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)"
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?"
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "şunun arması: --%s"
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "bilinmeyen seçenek '%s'"
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "bilinmeyen anahtar '%c'"
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "kullanım: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " veya: %s"
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr "%*s%s"
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-SAYI"
msgid "the remote end hung up unexpectedly"
msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s"
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokol hatası: hatalı satır uzunluğu %d"
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "uzak konum hatası: %s"
msgid "could not read `log` output"
msgstr "'log' çıktısı okunamadı"
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr "'%s' işlemesi ayrıştırılamadı"
msgid "failed to generate diff"
msgstr "diff oluşturulamadı"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only ve --right-only birlikte kullanılmaz"
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "'%s' günlüğü ayrıştırılamadı"
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr "'%s' dosyası indekslenemiyor"
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr "'%s' indekse eklenemiyor"
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamıyor"
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor"
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr "İndeks yenileniyor"
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"index.version ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr "hatalı imza 0x%08x"
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr "hatalı indeks sürümü %d"
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr "hatalı indeks dosyası sha1 imzası"
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor"
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr "%.4s uzantısı yok sayılıyor"
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında"
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr "indekste sırasız hazırlama alanı girdileri"
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri"
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' için sırasız hazırlama alanı girdileri"
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr "indeks dosyası hasar görmüş"
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr "%s: indeks dosyası açılamadı"
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: açık indeksin bilgileri alınamıyor"
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indeks dosyası beklenenden daha küçük"
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: indeks dosyası eşlemlenemiyor%s"
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "paylaşılan indeks '%s' tazelenemedi"
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı"
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr "'%s' kapatılamadı"
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr "bir sparse-index'e dönüştürülemedi"
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr "'%s' bilgileri alınamadı"
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr "git dizini açılamıyor: %s"
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr "bağlantı kesilemiyor: %s"
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
"Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr "%s: 'preserve'in yerini 'merges' aldı"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr "gitti"
msgid "Integer value expected refname:rstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "tanımlanamayan %%(%s) argümanı: %s"
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) argüman almıyor"
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr "%%(body) argüman almıyor"
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tanımlanamayan %%(subject) argümanı: %s"
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr "pozitif değer şunu bekliyordu: contents:lines=%s"
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "tanımlanamayan %%(contents) argümanı: %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "tanımlanamayan %%(raw) argüman: %s"
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr "tanımlanamayan genişlik:%s"
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "tanımlanamayan %%(align) argümanı: %s"
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "tanımlanamayan %%(if) argümanı: %s"
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
msgstr ""
"bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor"
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "biçim: %%(%s) ögeciği bir %%(%s) ögeciği olmadan kullanıldı"
#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "bozuk başvuru %s yok sayılıyor"
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr "biçim: %%(end) ögeciği eksik"
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr "hatalı oluşturulmuş nesne adı %s"
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr "'%s' bir işlemeye işaret etmeli"
msgid "invalid branch name: %s = %s"
msgstr "geçersiz dal adı: %s = %s"
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr "sarkan sembolik başvuru %s yok sayılıyor"
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "%s başvurusu için olan günlükte %s sonrasında boşluk var"
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
"%s başvurusu için olan günlük %s konumunda beklenmedik bir biçimde sonlandı"
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr "%s için olan günlük boş"
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' mevcut; '%s' oluşturulamıyor"
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "'%s' ve '%s' aynı anda işlenemiyor"
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr "%s başvurusu kaldırılamadı"
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "%s başvurusu silinemedi: %s"
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "başvurular silinemedi: %s"
msgid "invalid refspec '%s'"
msgstr "geçersiz başvuru belirteci '%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Hem %s hem %s şuraya getirilemiyor: %s"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s genelde %s ögesini izler, %s değil"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hem %s hem %s ögelerini izler"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "dizginin '%s' anahtarında '*' yoktu"
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "dizginin '%s' değerinde '*' yok"
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
"nitelendirmelisiniz."
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
"oluşturmak istediniz?"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
"oluşturmak istediniz?"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
"etiketlemek istediniz?"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
"etiketlemek istediniz?"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s dala çözülemiyor"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "'%s' silinemiyor: uzak başvuru yok"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "hedef başvurusu %s birden çok kaynaktan alıyor"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "HEAD bir dala işaret etmiyor"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "böyle bir dal yok: '%s'"
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "üstkaynak dalı '%s' bir uzak izleme dalı olarak depolanmıyor"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalı yok"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' dalının itme için uzak konumu yok"
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "'%s' için olan başvuru belirteçleri '%s' içermiyor"
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "itilecek bir hedef yok (push.default: 'nothing')"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr "tek bir konuma 'simple' itme çözülemiyor"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "%s uzak başvurusu bulunamadı"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Dalınız '%s' temelli; ancak üstkaynak kaybolmuş.\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Dalınız '%s' ile güncel.\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Sizin dalınız ve '%s' başka işlemelere başvuruyor.\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (ayrıntılar için \"%s\" kullanın)\n"
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Dalınız '%s' dalından %d işleme ileride.\n"
msgstr[1] "Dalınız '%s' dalından %d işleme ileride.\n"
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
msgstr[1] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (yerel dalınızı güncellemek için \"git pull\" kullanın)\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
"her birinde %d ve %d işleme var.\n"
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
msgid "there were errors while writing '%s' (%s)"
msgstr "'%s' yazılırken hatalar vardı (%s)"
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "'%s' floş yapılamadı"
#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
-msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı"
+msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı."
#: rerere.c:737
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "'%s' için öngörüntü kaydedildi"
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
msgid "could not determine HEAD revision"
msgstr "HEAD revizyonu saptanamadı"
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "%s ögesinin ağacı bulunamadı"
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input, --no-walk ile uyumsuz"
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk, --unsorted-input ile uyumsuz"
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr "geçerli dalınız bozuk gibi görünüyor"
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok"
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor"
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "async iş parçacığı oluşturulamadı: %s"
msgid "could not delete '%s'"
msgstr "'%s' silinemedi"
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "'%s' kaldırılamadı"
"atlayabilirsiniz. İptal edip \"git revert\" öncesine\n"
"geri dönmek için \"git revert --abort\" çalıştırın."
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr "'%s' kilitlenemedi"
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
msgid "could not write eol to '%s'"
msgstr "satır sonu şuraya yazılamadı: '%s'"
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr "'%s' tamamlanamadı"
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s' okunamadı"
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr "%s: ileri sar"
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Geçersiz temizlik kipi %s"
msgid "unable to dequote value of '%s'"
msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s' okuma için açılamadı"
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' başarısız oldu"
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "yeni yapılan işleme aranamadı"
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "yeni yapılan işleme ayrıştırılamadı"
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr "ayrık HEAD"
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr " (kök işleme)"
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr "HEAD ayrıştırılamadı"
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s bir işleme değil"
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr "HEAD işlemesi ayrıştırılamadı"
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr "işleme yazarı ayrıştırılamıyor"
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree bir ağaca yazamadı"
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "'%s' konumundan işleme iletisi okunamıyor"
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr "geçersiz yazar kimliği '%s'"
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr "hasar görmüş yazar: tarih bilgisi eksik"
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "işleme nesnesi yazılamadı"
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "%s güncellenemedi"
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr "%s işlemesi ayrıştırılamadı"
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr "üst işleme %s ayrıştırılamadı"
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr "bilinmeyen komut: %d"
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr "Birinci işleme iletisi bu:"
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr "İşleme iletisi #%d bu:"
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr "Birinci işlemenin iletisi atlanacak:"
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "İşleme iletisi #%d atlanacak:"
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr "Bu %d işlemenin bir birleşimi."
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr "'%s' yazılamıyor"
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr "düzeltmek için bir HEAD gerekiyor"
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr "HEAD okunamadı"
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr "HEAD'in işleme iletisi okunamadı"
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr "%s işleme iletisi okunamadı"
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr "indeks dosyanız birleştirilmemiş"
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr "kök işleme düzeltilemiyor"
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "%s işlemesi bir birleştirme; ancak bir -m seçeneği verilmedi."
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr "%s işlemesinin %d diye bir üst ögesi yok"
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr "%s işlemesinin iletisi alınamıyor"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: üst işleme %s ayrıştırılamıyor"
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr "%s geri alınamadı... %s"
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr "%s uygulanamadı... %s"
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "%s %s bırakılıyor -- yama içeriği halihazırda üstkaynakta\n"
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: indeks okunamadı"
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: indeks yenilenemedi"
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s argüman kabul etmiyor: '%s'"
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr "%s için eksik argüman"
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr "'%s' ayrıştırılamadı"
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr "geçersiz satır %d: %.*s"
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr "'%s' okunamadı."
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr "sürmekte olan bir seç-al iptal ediliyor"
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr "sürmekte olan bir geri al iptal ediliyor"
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr "Hiçbir işleme ayrıştırılmadı."
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr "bir geri al sırasında seç-al yapılamıyor"
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr "bir seç-al sırasında geri al yapılamıyor"
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s için geçersiz değer: %s"
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr "kullanılabilir olmayan squash-onto"
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr "boş işleme seti aktarıldı"
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr "geri al halihazırda sürüyor"
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr "seç-al halihazırda sürüyor"
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr "HEAD kilitlenemedi"
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr "süren bir seç-al veya geri al yok"
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr "HEAD çözülemiyor"
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr "daha doğmamış bir daldan iptal edilemiyor"
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "'%s' açılamıyor"
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s' okunamıyor: %s"
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr "beklenmedik dosya sonu"
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş"
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "HEAD'i taşımış görünüyorsunuz. Geri sarılmıyor, HEAD'inizi denetleyin!"
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr "süren bir geri al yok"
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr "süren bir seç-al yok"
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr "işleme atlanamadı"
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr "atlanacak bir şey yok"
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"İşlemeyi yaptınız mı?\n"
"\"git %s --continue\" deneyin.\""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamıyor"
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "%s uygulanamıyor... %.*s"
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr "%.*s birleştirilemedi"
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamadı"
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr "Çalıştırılıyor: %s\n"
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yapıldı\n"
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "izin verilmeyen etiket adı: '%.*s'"
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr "sahte kök işlemesi yazılıyor"
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr "squash-onto yazılıyor"
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr "'%s' çözülemedi"
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr "güncel bir revizyon olmadan birleştirilemiyor"
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr "'%.*s' ayrıştırılamıyor"
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "birleştirilecek bir şey yok: '%.*s'"
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz"
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr "'%s' işlemesinin işleme iletisi alınamadı"
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr "merge: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr "Kendiliğinden zulalanamıyor"
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Beklenmedik zula yanıtı: '%s'"
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr "'%s' için dizin oluşturulamadı"
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr "Zula kendiliğinden oluşturuldu: %s\n"
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr "'reset --hard' yapılamadı"
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr "Kendiliğinden zulalama uygulandı.\n"
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr "%s depolanamıyor"
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"Değişiklikleriniz zulada güvende.\n"
"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr "HEAD'de duruldu\n"
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr "%s konumunda duruldu\n"
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
"\tgit rebase --edit-todo\n"
"\tgit rebase --continue\n"
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "%s konumunda durdu... %.*s\n"
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr "bilinmeyen komut %d"
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr "orig-head okunamadı"
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr "'onto' okunamadı"
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr "HEAD şu konuma güncellenemedi: %s"
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr "var olmayan işleme değiştirilemiyor"
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr "geçersiz dosya: '%s'"
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr "geçersiz içerik: '%s'"
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce\n"
"onları işleyin ve ardından 'git rebase --continue' yapın."
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr "dosya yazılamadı: '%s'"
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr "Hazırlanmış değişiklikler işlenemedi."
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: Bir %s seçip alınamıyor"
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr "%s hatalı revizyon"
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr "ilk işleme geri alınamaz"
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr "daha önce uygulanan %s işlemesi atlandı"
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr "atlanan işlemeleri içermek için --reapply-cherry-picks kullanın"
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr "make_script: ele alınmayan seçenekler"
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr "make_script: revizyonlar hazırlanırken hata"
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr "yapılacak bir şey yok"
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr "gerekli olmayan seçim komutları atlanamadı"
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr "betik halihazırda yeniden düzenlenmişti"
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s', '%s' konumunda depo dışında"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"%s: Çalışma ağacında böyle bir yol yok.\n"
"Yerelde var olmayan yolları belirtmek için 'git <komut> -- <yol>... kullanın."
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "'%s' seçeneği seçenek olmayan argümanlardan önce gelmeli"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı"
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Beklenen git repo sürümü <= %d, %d bulundu"
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "bilinmeyen depo genişletmesi bulundu:"
msgstr[1] "bilinmeyen depo genişletmeleri bulundu:"
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:"
msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr "'%s' açılırken hata"
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "bir .git dosyası olabilmek için çok büyük: '%s'"
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr "%s okunurken hata"
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr "geçersiz gitfile biçimi: %s"
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr "gitfile içinde yol yok: %s"
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr "bir git deposu değil: %s"
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' çok büyük"
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr "bir git deposu değil: '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr "'%s' konumuna chdir yapılamıyor"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr "cwd'ye geri dönülemiyor"
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "'%*s%s%s' bilgileri alınamadı"
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr "Şu anki çalışma dizini okunamıyor"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr "şuraya değiştirilemiyor: '%s'"
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s"
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"ayarlanmamış)."
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n"
"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr "çatallama başarısız"
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr "setsid başarısız"
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
msgstr[0] "%u bayt/sn"
msgstr[1] "%u bayt/sn"
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "'%s' yazma için açılamadı"
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr "'%s' düzenlenemedi"
msgid "process for submodule '%s' failed"
msgstr "'%s' altmodülü için işlem başarısız oldu"
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
msgid "invalid remote service path"
msgstr "geçersiz uzak konum servis yolu"
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr "işlem protokol tarafından desteklenmiyor"
#: transport.c:1197
msgid "Aborting."
-msgstr "İptal ediliyor"
+msgstr "İptal ediliyor."
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr "gereken tüm altmodüller itilemedi"
msgid "too-short tree file"
msgstr "ağaç dosyası çok kısa"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%sLütfen dal değiştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"yazılacak:\n"
"%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Geçerli çalışma dizinini kaldırma reddediliyor:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"yazılacak:\n"
"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"yazılacak:\n"
"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"Altmodül güncellenemiyor:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"güncellenmedi:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "İptal ediliyor\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak "
"isteyebilirsiniz.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Dosyalar güncelleniyor"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n"
"gruptan yalnızca bir tanesi çalışma ağacında:\n"
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr "İndeks bayrakları güncelleniyor"
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s"
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "getir argümanlarından sonra floş bekleniyordu"
msgid "Fetching objects"
msgstr "Nesneler getiriliyor"
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "'%s' okunamadı"
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' mevcut değil"
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' bir .git dosyası değil, hata kodu %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' şuna geri işaret etmiyor: '%s'"
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "bir dizin değil"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ".git bir dosya değil"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr ".git dosyası bozuk"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr ".git dosyası doğru değil"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "geçerli bir yol değil"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "depo konumu bulunamıyor: .git bir dosya değil"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "okunamayan gitdir"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "doğru olmayan gitdir"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "geçerli bir dizin değil"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "gitdir dosyası mevcut değil"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "gitdir dosyası (%s) okunamıyor"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "geçersiz gitdir dosyası"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "İşlenecek değişiklikler:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "İşleme için hazırlanmamış değişiklikler:"
#: wt-status.c:300
msgid "unknown:"
-msgstr "bilinmiyor"
+msgstr "bilinmiyor:"
#: wt-status.c:302
msgid "unmerged:"
msgid "untracked content, "
msgstr "izlenmeyen içerik, "
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Zulanızda şu anda %d girdi var"
msgstr[1] "Zulanızda şu anda %d girdi var"
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "İşlenecek altmodül değişiklikleri:"
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
"Altındaki her şey yok sayılacaktır."
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n"
"Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "Birleştirilmemiş yollarınız var."
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " (çakışmaları onar ve \"git commit\" çalıştır)"
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz."
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "Bir 'am' oturumunun tam ortasındasınız."
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "Mevcut yama boş."
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (çakışmaları onar ve ardından \"git am --continue\" çalıştır)"
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git am --skip\" kullanın"
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (yamayı boş işleme kaydı olarak yazmak için \"git am --allow-empty\" "
+"kullanın)"
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo eksik"
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "Yerine getirilen bir komut yok."
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Son yerine getirilen komut (toplamda %d komut):"
msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):"
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " (ek bilgi için %s dosyasına bakın)"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "Kalan komut yok."
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Sıradaki yerine getirilecek komut (%d kalan komut):"
msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):"
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "Şu anda yeniden temellendirme yapmaktasınız."
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)"
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
"parçalara bölüyorsunuz."
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
"düzenliyorsunuz."
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)"
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "Seç-al şu anda sürmekte."
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)"
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "Geriye al şu anda sürmekte."
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Şu anda %s işlemesini geri alıyorsunuz."
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (çakışmaları onar ve \"git revert --continue\" çalıştır)"
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " (sürdürmek için \"git revert --continue\" çalıştır)"
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git revert --skip\" kullanın)"
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (geri al işlemini iptal için \"git revert --abort\" kullanın)"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı."
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
-msgstr "Şu anda ikili arama yapıyorsunuz"
+msgstr "Şu anda ikili arama yapıyorsunuz."
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (ilk dala dönmek için \"git bisect reset\" kullanın)"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "Bir aralıklı çıkış içindesiniz."
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız."
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "Üzerinde bulunulan dal: "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "şunun üzerine yeniden temellendirme sürmekte: "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr "HEAD şurada ayrıldı: "
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr "HEAD şundan ayrıldı: "
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "Şu anda bir dal üzerinde değil."
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "İlk işleme"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "Henüz bir işleme yok"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "İzlenmeyen dosyalar"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "Yok sayılan dosyalar"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n"
"konusunda dikkatli olmalısınız (ek bilgi için 'git help status')."
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "İzlenmeyen dosyalar listelenmiyor%s"
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "Değişiklik yok"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
"kullanın)\n"
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "İşlemeye eklenen değişiklik yok\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için\n"
+"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için "
"\"git add\" kullanın)\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
"add\" kullanın)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "İşlenecek bir şey yok\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "Şurada henüz bir işleme yok: "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD (dal yok)"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "değişik"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "şunun arkasında: "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "şunun önünde: "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor."
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "IPC komutu gönderilemedi"
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "IPC yanıtı okunamadı"
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "accept_thread '%s' başlatılamadı"
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "'%s' için worker[0] başlatılamadı"
msgid "Unstaged changes after refreshing the index:"
msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "İndeks okunamadı"
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "Yama yazılamadı"
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "yamayı düzenleme başarısız"
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s' dosya bilgileri alınamadı"
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "Boş yama. İptal edildi."
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s' uygulanamadı"
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok "
"sayılıyor:\n"
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "sınama turu"
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "ayrıntı ver"
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr "etkileşimli seçim"
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "parçaları etkileşimli olarak seç"
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "geçerli diff'i düzenle ve uygula"
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "izlenen dosyaları güncelle"
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)"
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)"
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "ekleme, yalnızca indeksi yenile"
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını "
"denetle"
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr "aralıklı çıkış konisi dışındaki girdileri güncellemeye izin ver"
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl"
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "gömülü bir depo eklenirken uyar"
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "'git stash -p' için arka uç"
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Ek bilgi için: \"git help submodule\"."
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "gömülü git deposu ekleniyor: %s"
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"Bu iletiyi 'git config advice.addIgnoredFile false'\n"
"kullanarak kapatabilirsiniz."
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "dosya ekleme başarısız"
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file, --edit ile uyumsuz"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A ve -u karşılıklı olarak uyumlu"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte "
-"kullanılabilir"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' ya -x ya da +x olmalıdır"
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' ve yol belirteci argümanları birlikte kullanılamaz"
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
"yaparak kapatabilirsiniz."
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "--empty için geçersiz değer: %s"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "yazar betiği ayrıştırılamadı"
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' applypatch-msg kancası tarafından silindi"
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız"
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "fseek başarısız oldu"
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "'%s' yaması ayrıştırılamadı"
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir"
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "geçersiz zaman damgası"
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "geçersiz tarih satırı"
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "geçersiz zaman dilimi ofseti"
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "Yama biçimi algılaması başarısız."
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Yamalar parçalanıp bölünemedi."
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın."
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın."
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+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\" "
+"çalıştırın."
+
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" "
"çalıştır."
-#: builtin/am.c:1224
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş "
"olabilir."
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Yama boş."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "%s işlemesinde yazar satırı eksik"
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "geçersiz tanımlama satırı: %.*s"
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye "
"değil."
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..."
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Yamanızı elle mi düzenlediniz?\n"
"Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..."
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "Değişiklikler birleştirilemedi."
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "boş bir geçmişe uygulanıyor"
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
-msgstr "sürdürülemiyor: %s yok"
+msgstr "sürdürülemiyor: %s yok."
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "İşleme gövdesi:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: "
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "indeks dosyası yazılamıyor"
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Applying: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Boş bir işleme oluşturuluyor: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Yama boş."
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "Uygulanıyor: %.*s"
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Yama şurada başarısız oldu: %s %.*s"
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Değişiklik yok -- boş bir işleme olarak kayıt yazıldı."
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n"
"aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz."
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
"yapabilirsiniz."
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' nesnesi ayrıştırılamadı."
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr "indeks temizlenemedi"
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n"
"ORIG_HEAD'e geri sarılmıyor."
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Geçersiz --patch-format değeri: %s"
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "--show-current-patch için geçersiz değer: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "'%s=%s' ve '%s=%s' seçenekleri birlikte kullanılamaz"
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "etkileşimli olarak çalıştır"
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "tarihi seçenek -- no-op"
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "sessiz ol"
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "işleme iletisine bir Signed-off-by satırı ekle"
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "utf8 olarak yeniden kodla (öntanımlı)"
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "'git-mailinfo'ya -k bayrağını geçir"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "'git-mailinfo'ya -b bayrağını geçir"
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "'git-mailinfo'ya -m bayrağını geçir"
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir"
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme"
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "git-mailinfo içerisinden geçir"
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "git-apply aracılığıyla geçir"
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr "n"
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "biçim"
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "yama biçimi"
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl"
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "--continue eşanlamlıları"
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "geçerli yamayı atla"
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et"
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr "yamalama işlemini iptal et; ancak HEAD'i olduğu yerde bırak"
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "uygulanmakta olan yamayı göster"
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "boş yamayı bir boş işleme olarak kayıt yaz"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "işleyici tarihi hakkında yalan söyle"
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "yazar tarihi için geçerli zaman damgasını kullan"
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "GPG imzalı işlemeler"
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "boş yamaların nasıl değerlendirileceği"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "(git-rebase için iç kullanım)"
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n"
"yakında kaldırılacak. Lütfen artık kullanmayın."
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr "indeks okunamadı"
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi."
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"Başıboş %s dizini bulundu.\n"
"Kaldırmak için \"git am --abort\" kullanın."
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz."
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
msgid "show work cost statistics"
msgstr "iş maliyet istatistiklerini göster"
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "durum belirtmeyi zorla"
msgid "ignore whitespace differences"
msgstr "boşluk ayrımlarını yok say"
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "revizyon"
msgstr ""
"Yalnızca <başlangıç>,<bitiş> satır erimini veya :<işlevadı> işlevini işle"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "4 yıl 11 ay önce"
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "%s dosyasında yalnızca %lu satır var"
msgstr[1] "%s dosyasında yalnızca %lu satır var"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "Genel bakış satırları"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<seçenekler>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"'%s' dalı siliniyor: Bu dal '%s'\n"
-" dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş"
+" dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş."
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n"
" '%s' dalına birleştirilmemiş."
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "'%s' için işleme nesnesi aranamadı"
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"'%s' dalı tümüyle birleştirilmemiş.\n"
"Eğer silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın."
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "config-file güncellemesi başarısız"
#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
-msgstr "HEAD için işleme nesnesi aranamadı"
+msgstr "HEAD için işleme nesnesi aranamadı."
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'"
+msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'."
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
-msgstr "uzak izleme dalı '%s' bulunamadı"
+msgstr "Uzak izleme dalı '%s' bulunamadı."
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
-msgstr "'%s' dalı bulunamadı"
+msgstr "'%s' dalı bulunamadı."
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "%s dalı silindi (%s idi).\n"
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "biçim dizisi ayrıştırılamıyor"
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "HEAD çözülemedi"
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s dalı %s konumunda ikili aranıyor"
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
-msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz"
+msgstr "Bir dalın üzerinde değilken geçerli dal kopyalanamaz."
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
-msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz"
+msgstr "Bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz."
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Geçersiz dal adı: '%s'"
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "Dal yeniden adlandırması başarısız"
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "Dal kopyalaması başarısız"
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Yanlış adlandırılan '%s' dalının bir kopyası oluşturuldu"
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Dal %s olarak yeniden adlandırıldı; ancak HEAD güncellenmedi!"
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr "Dal yeniden adlandırıldı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr "Dal kopyalandı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
"\t%s\n"
"'%c' ile başlayan satırlar çıkarılacaktır.\n"
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "Genel seçenekler"
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr "sağlamayı ve konuyu göster, üstkaynak dalı için iki kez ver"
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "bilgi iletilerini gizle"
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "dal izleme yapılandırmasını ayarla"
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr "kullanma"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr "üstkaynak"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "üstkaynak bilgisini değiştir"
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "üstkaynak bilgisini kaldır"
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "renklendirilmiş çıktı kullan"
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "uzak izleme dallarında iş yap"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "yalnızca işlemeyi içeren dalları yazdır"
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "Özel git-branch eylemleri:"
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "hem uzak izleme hem de yerel dalları listele"
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "tümüyle birleştirilen dalı sil"
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "dalı sil (birleştirilmemiş olsa bile)"
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü taşı/yeniden adlandır"
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "bir dalı kopyala, hedef var olsa bile"
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "dal adlarını listele"
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "geçerli dal adını göster"
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "dalın başvuru günlüğünü oluştur"
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "dalın açıklamasını düzenle"
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "yalnızca birleştirilen dalları yazdır"
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "yalnızca birleştirilmeyen dalları yazdır"
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "dalları sütunlarla listele"
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr "nesne"
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "yalnızca nesnenin dallarını yazdır"
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir"
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "çıktı için kullanılacak biçim"
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD, refs/heads altında bulunamadı!"
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column ve --verbose birbiriyle uyumsuz"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "dal adı gerekli"
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "birden çok dalın açıklaması düzenlenemiyor"
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "'%s' dalında henüz bir işleme yok."
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "'%s' adında bir dal yok."
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "bir kopyalama işlemi için çok fazla dal"
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "bir yeniden adlandırma işlemi için çok fazla argüman"
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
"etmiyor."
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "'%s' diye bir dal yok"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' diye bir dal mevcut değil"
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "üst kaynağı kaldırmak için çok fazla argüman"
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"HEAD'in üst kaynağı kaldırılamadı; çünkü herhangi bir dala işaret etmiyor."
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' dalının üstkaynak bilgisi yok"
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"'git branch'in -a ve -r seçenekleri bir dal adı almaz.\n"
"Şunu mu demek istediniz: -a|-r --list <dizgi>?"
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
-msgstr "Demeti çözmek için bir depo gerekli"
+msgstr "Demeti çözmek için bir depo gerekiyoriyor."
#: builtin/bundle.c:185
msgid "Unbundling objects"
msgid "terminate input and output records by a NUL character"
msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "ilerleme bildirimini gizle"
msgstr "git checkout--worker [<seçenekler>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr "dizi"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "'%s' yolu bizdeki sürüme iye değil"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "'%s' yolu onlardaki sürüme iye değil"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "'%s' yolu gereken tüm sürümlere iye değil"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "'%s' yolu gereken sürümlere iye değil"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "'%s' yolu: Birleştirilemiyor"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "'%s' için birleştirme sonuçları eklenemiyor"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu"
msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d yol şuradan güncellendi: %s"
msgstr[1] "%d yol şuradan güncellendi: %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "%d yol indeksten güncellendi"
msgstr[1] "%d yol indeksten güncellendi"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' güncellenmekte olan yollarla kullanılamaz"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s', %s ile birlikte kullanılamaz"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ne '%s' ne de '%s' belirtilmiş"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "'%s' yolu birleştirilmemiş"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "önce geçerli indeksinizi çözmelisiniz"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
"%s"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n"
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "HEAD konumu:"
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "HEAD güncellenemiyor"
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' dalı sıfırlandı.\n"
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "Halihazırda '%s' üzerinde\n"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Yeni '%s' dalına geçildi.\n"
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' dalına geçildi.\n"
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
-msgstr "... ve %d daha.\n"
+msgstr " ... ve %d daha.\n"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"\tgit branch <yeni-dal-adı> %s\n"
"\n"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "revizyonlarda gezinirken iç hata"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "Önceki HEAD konumu şuydu:"
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "Henüz doğmamış bir dal üzerindesiniz"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n"
"Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin."
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
"ayarını yapmayı düşünün."
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "yalnızca bir başvuru bekleniyordu"
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
-msgstr "yalnızca bir başvuru bekleniyordu, %d verildi"
+msgstr "Yalnızca bir başvuru bekleniyordu, %d verildi."
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "geçersiz başvuru: %s"
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "başvuru bir ağaca değil: %s"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "bir dal bekleniyordu, '%s' alındı"
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"Birleştirme yaparken dal değiştirilemiyor.\n"
"\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n"
"\"git am --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"Yeniden temellendirme yaparken dal değiştirilemiyor.\n"
"\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"Seç-al yaparken dal değiştirilemiyor.\n"
"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"Geriye al yaparken dal değiştirilemiyor.\n"
"\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "ikili arama yaparken dal değiştiriyorsunuz"
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "dal değiştirilirken yollar kullanılamaz"
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "dal değiştirilirken '%s' kullanılamaz"
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s', '%s' ile birlikte kullanılamaz"
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s', <başlama-noktası> alamaz"
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "dal veya işleme argümanı eksik"
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir"
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "çakışma stili (birleştirme veya diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "çakışma stili (birleştirme, diff3 veya zdiff3)"
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "adı verilen işlemede HEAD'i ayır"
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "yeni dal için üstkaynak bilgisi ayarla"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "yeni dal"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "yeni üst ögesi olmayan dal"
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme"
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c ve --orphan birlikte kullanılmaz"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "'-%c', '-%c' ve '%s' seçenekleri birlikte kullanılamaz"
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p ve --overlay birlikte kullanılmaz"
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "--track için bir dal adı gerekli"
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "eksik dal adı; -%c deneyin"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "%s çözülemedi"
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "geçersiz yol belirtimi"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach bir '%s' yol argümanı almıyor"
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file, --detach ile uyumsuz"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file, --patch ile uyumsuz"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
-"birlikte kullanılamaz"
+"birlikte kullanılamaz."
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "dal"
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "yeni bir dal oluştur ve çıkış yap"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "bir dal oluştur/sıfırla ve çıkış yap"
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "yeni dal için başvuru günlüğü oluştur"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "yerpaylaşım kipini kullan (öntanımlı)"
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "yeni bir dal oluştur ve ona geç"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "bir dal oluştur/sıfırla ve ona geç"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "yerel değişiklikleri çöpe at"
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "çıkış yapılacak ağacımsı"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "indeksi eski durumuna getir"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "çalışma ağacını eski durumuna getir"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "birleştirilmemiş girdileri yok say"
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "yerpaylaşım kipini kullan"
msgid "could not lstat %s\n"
msgstr "%s 'lstat' yapılamadı\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Geçerli çalışma dizinini kaldırma reddediliyor\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Geçerli çalışma dizinini kaldırmayı reddederdim\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - benzersiz öneke dayanarak bir öge seç\n"
" - (boş) hiçbir şey seçme\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - choose all items\n"
" - (empty) finish selecting\n"
msgstr ""
-"İstem yardımı:1 - tek bir öge seç\n"
+"İstem yardımı:\n"
+"1 - tek bir öge seç\n"
"3-5 - bir öge aralığı seç\n"
"2-3,6-9 - birden çok erim seç\n"
"foo - benzersiz öneke dayanarak bir öge seç\n"
"* - tüm ögeleri seç\n"
" - (boş) seçimi bitir\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Pardon (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Girdi için yok sayma dizgileri>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Silinecek ögeleri seçin"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "%s kaldırılsın mı [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - bu ekranı görüntüle\n"
"? - istem seçimi için yardım"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Aşağıdaki öge kaldırılacak:"
msgstr[1] "Aşağıdaki ögeler kaldırılacak:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Temizlenecek başka dosya yok, çıkılıyor."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "kaldırılan dosyaların adlarını yazdırma"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "zorla"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "etkileşimli temizlik"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "dizinleri tümüyle kaldır"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "dizgi"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "yok sayma kurallarına <dizgi> ekle"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "yok sayılan dosyalar da kaldırıldı"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "yalnızca yok sayılan dosyaları kaldır"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
"verilmiş; temizleme reddediliyor"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; "
"temizleme reddediliyor"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x ve -X birlikte kullanılamaz"
msgid "directory from which templates will be used"
msgstr "şablonların kullanılacağı dizin"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "başvuru deposu"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "--reference'ı yalnızca klonlarken kullan"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "ad"
msgid "path to git-upload-pack on the remote"
msgstr "uzak konumdaki git-upload-pack'e olan yol"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr "derinlik"
msgid "create a shallow clone of that depth"
msgstr "verilen derinlikte sığ bir depo oluştur"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr "zaman"
msgid "create a shallow clone since a specific time"
msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "revizyon"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr "yalnızca bir dal klonla, HEAD veya --branch"
msgid "set config inside the new repository"
msgstr "yapılandırmayı yeni deponun içinde ayarla"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "sunucuya özel"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "iletme seçeneği"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "yalnızca IPv4 adresleri kullan"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "yalnızca IPv6 adresleri kullan"
msgid "cannot unlink temporary alternates file"
msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "Çok fazla argüman."
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "Klonlamak için bir depo belirtmelisiniz."
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz"
#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' deposu mevcut değil"
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr "%s derinliği pozitif bir sayı değil"
msgid "working tree '%s' already exists."
msgstr "Çalışma ağacı '%s' halihazırda mevcut."
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
"split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bölme-seçenekleri>"
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr "dizin"
msgid "Collecting commits from input"
msgstr "Girdiden işlemeler toplanıyor"
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "tanımlanamayan altkomut: %s"
msgid "duplicate parent %s ignored"
msgstr "yinelenmiş üst öge %s yok sayıldı"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "%s geçerli bir nesne adı değil"
msgid "id of a parent commit object"
msgstr "bir üst işleme ögesinin no'su"
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr "ileti"
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "işleme iletisi"
msgid "read commit log message from file"
msgstr "işleme günlük iletisini dosyadan oku"
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "işlemeyi GPG ile imzala"
msgid "failed to unpack HEAD tree object"
msgstr "HEAD ağaç nesnesi açılamadı"
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor"
-
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "--fixup:%s ile -m birlikte kullanılamaz"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "'%s' ve '%s:%s' seçenekleri birlikte kullanılamaz"
#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgid "Error building trees"
msgstr "Ağaçlar yapılırken hata"
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n"
msgid "Invalid ignored mode '%s'"
msgstr "Geçersiz yok sayılanları göster kipi '%s'"
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long ve -z birbiriyle uyumsuz"
-
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Bir birleştirmenin tam ortasındasınız -- ileti değiştirilemiyor."
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor"
+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"
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/--"
-"only ile birlikte kullanılamaz"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "'%s' ögesinin yeniden yazım seçeneği ve '%s' birlikte kullanılamaz"
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor"
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "Değiştirecek bir şeyiniz yok."
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
"Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz"
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup arasından yalnızca bir tanesi kullanılabilir."
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "-m seçeneği -c/-C/-F ile birlikte kullanılamaz."
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author yalnızca -C, -c veya --amend ile birlikte kullanılabilir."
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch arasından yalnızca bir tanesi "
"kullanılabilir."
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "bilinmeyen seçenek: --fixup=%s:%s"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "durumu kısaca göster"
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "dal bilgisini göster"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "zula bilgisini göster"
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "tam önünde/arkasında değerlerini hesapla"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr "sürüm"
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "makine tarafından okunabilir çıktı"
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "durumu uzun biçimde göster (öntanımlı)"
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "girdileri NUL ile sonlandır"
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "kip"
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: "
"all)"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) "
"matching (eşleşen), no (hayır) (Öntanımlı: traditional)."
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "ne zaman"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all "
"(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)."
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "izlenmeyen dosyaları sütunlarla göster"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "yeniden adlandırmaları algılama"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr ""
"yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte "
"kullanımı"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "başarılı işlemenin ardından özeti gizle"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "diff'i işleme iletisi şablonunda göster"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "İşleme iletisi seçenekleri"
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "iletiyi dosyadan oku"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr "yazar"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "işleme yazarını geçersiz kıl"
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "tarih"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "işleme tarihini geçersiz kıl"
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "işleme"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "belirtilen işlemenin iletisini yeniden kullan"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]işleme"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"belirtilen işlemeyi değiştirmek/iletiyi yeniden yazmak için kendiliğinden "
"tıkıştırma tarafından biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"belirtilen işlemeyi tıkıştırmak için kendiliğinden tıkıştırma tarafından "
"biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"işlemenin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)"
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "artbilgi"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr "özel artbilgiler ekle"
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "bir Signed-off-by artbilgisi ekle"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "belirtilen şablon dosyasını kullan"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "işlemeyi zorla düzenle"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr "işleme iletisi şablonunda durumu içer"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "İşleme içeriği seçenekleri"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "değiştirilen tüm dosyaları gönder"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "belirtilen dosyaları işleme için indekse ekle"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "dosyaları etkileşimli olarak ekle"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "değişiklikleri etkileşimli olarak ekle"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "yalnızca belirtilen dosyaları gönder"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr "pre-commit ve commit-msg kancalarını atla"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "neyin işleneceğini göster"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "önceki işlemeyi değiştir"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "post-rewrite kancasını atla"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "boş bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "boş iletili bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE okunamadı"
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "işleme iletisi okunamadı: %s"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "İşleme iletisinin boş bırakılmasından ötürü iptal ediliyor.\n"
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n"
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "İşleme iletisi gövdesinin boş bırakılmasından ötürü iptal ediliyor.\n"
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "do not consider tags matching <pattern>"
msgstr "<dizgi> ile eşleşen etiketleri dikkate alma"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "kısaltılmış işleme nesnesini geri çekilinecek nesne olarak göster"
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "<im>'i bozuk çalışma ağacına iliştir (öntanımlı: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long, --abbrev=0 ile uyumsuz"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty, işlememsilerle uyumsuz"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken, işlememsilerle uyumsuz"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin ve --merge-base birlikte kullanılamaz"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
msgid "%s...%s: no merge base"
msgstr "%s...%s: birleştirme temeli yok"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Bir git deposu değil"
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "geçersiz nesne '%s' verildi"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "ikiden çok ikili nesne verildi: '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "ele alınmayan nesne '%s' verildi"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "%s sembolik bağı okunamadı"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "%s sembolik bağ dosyası okunamadı"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "%s nesnesi %s sembolik bağı için okunamadı"
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
"Birleştirilmiş diff biçimleri ('-c' ve '--cc') dizin diff kipinde\n"
"('-d' ve '--dir-diff') desteklenmiyor."
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "Çalışma ağacı dosyası bırakıldı."
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "'%s' konumunda geçici dosyalar var."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr "başarısız: %d"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "'diff.tool' yerine 'diff.guitool' kullan"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "bir tam dizin diff'i gerçekleştir"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "bir diff aracı çalıştırmadan önce sorma"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "dir-diff kipinde sembolik bağlar kullan"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr "araç"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "belirtilen diff aracını kullan"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
"çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-"
"difftool'un çıkış yapmasını sağla"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "diff'leri görüntülemek için özel bir komut belirle"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "'diff'e aktarıldı"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff, --no-index ile uyumsuz"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr "--tool=<araç> için bir <araç> verilmedi"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "--extcmd=<komut> için bir <komut> verilmedi"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Hata: İç içe geçmiş etiketler --mark-tags belirtilmediği sürece dışa "
"aktarılamaz."
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map jetonu boş olamaz"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "<n> nesneden sonra ilerlemeyi göster"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "nesnelerce süzülen etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"başka bir kodlamaya iye işleme iletilerinin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "imleri bu dosyaya boşalt"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "imleri bu dosyadan içe aktar"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "eğer varsa bu dosyadan imleri içe aktar"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "her işleme için tüm ağacın çıktısını ver"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "ikili nesne verisi çıktısını atla"
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "başvuru belirteci"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "çıktı kimliğini gizle"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "kimden:kime"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "<kimden> ve <kime>'yi anonimleştirilmiş çıktıda dönüştür"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "'fast-export' akışında olmayan üst ögelere nesne numarası ile başvur"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "etiketleri im numaralarıyla adlandır"
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarılamadı"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "'mark' komutu bekleniyordu, %s alındı"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "'to' komutu bekleniyordu, %s alındı"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Altmodül yeniden yazım seçeneği için name:filename biçimi bekleniyordu"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
msgid "Lockfile created but not reported: %s"
msgstr "Kilit dosyası oluşturuldu; ancak raporlanmadı: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<seçenekler>] <grup>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<seçenekler>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel negatif olamaz"
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "tüm uzak konumlardan getir"
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "git pull/fetch için üstkaynak ayarla"
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr "başvuruları güncellemek için atomsal işlem kullan"
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "uzak uçtaki yükleme paketine olan yol"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "yerel başvurunun üzerine zorla yaz"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "birden çok uzak konumdan getir"
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "tüm etiketleri getirme (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "paralelde getirilen altmodüllerin sayısı"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde "
"değiştir"
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "artık uzak konumda olmayan uzak izleme dallarını buda"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri "
"güncelle"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "istek üzerine"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesini denetle"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz"
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "indirilen paketi tut"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "HEAD başvurusunun güncellenmesine izin ver"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "sığ klonun geçmişini derinleştir"
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "zamana bağlı olarak sığ deponun geçmişini derinleştir"
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "tam bir depoya dönüştür"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "bunu altmodül yol çıktısının başına ekle"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma "
"dosyalarından daha az önceliğe iye)"
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow'u güncelleyen başvuruları kabul et"
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "ilgili başvuru"
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "getirme ile ilgili başvuruları belirt"
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını "
"yazdır"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "tüm güncellenmiş dalları zorlanmış güncellemeler için denetle"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "getirdikten sonra işleme grafiğini yaz"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "başvuru belirteçlerini stdin'den oku"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Uzak HEAD başvurusu bulunamadı"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
+msgstr "uzak HEAD başvurusu bulunamadı"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s"
msgid "[up to date]"
msgstr "[güncel]"
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr "[reddedildi]"
msgid "can't fetch in current branch"
msgstr "geçerli dalda getirme yapılamıyor"
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr "başka bir çalışma ağacında çıkış yapıldı"
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr "[etiket güncellemesi]"
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr "yerel başvuru güncellenemiyor"
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr "var olan etiketi değiştirecektir"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr "[yeni etiket]"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr "[yeni dal]"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr "[yeni başvuru]"
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr "zorlanmış güncelleme"
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr "ileri sarım değil"
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir,\n"
-"ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n"
+"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir;\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."
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
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"
"bu denetlemeden kaçınabilirsiniz.\n"
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tüm gerekli nesneleri göndermedi\n"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr "Şu konumdan: %.*s\n"
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sarkacak)"
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s sarkmaya başladı)"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr "[silindi]"
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr "(hiçbiri)"
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Çıplak olmayan deponun geçerli %s dalına getirme reddediliyor"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı"
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, 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"
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, 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"
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr "%s diye bir nesne yok"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi "
+"bir dala işaret etmiyor."
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr "bilinmeyen dal türü"
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
"Kaynak dal bulunamadı.\n"
"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr "%s getiriliyor\n"
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "%s getirilemedi"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
-"alınacağı bir URL veya uzak konum adı belirtin."
+"getirileceği bir URL veya uzak konum adı belirtin."
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Bir etiket adı belirtmeniz gerekiyor."
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
+msgstr "bir etiket adı belirtmeniz gerekiyor"
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen için negatif derinlik desteklenmiyor"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen ve --depth birlikte kullanılamaz"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth ve --unshallow birlikte kullanılamaz"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
+msgstr "--deepen içinde negatif derinlik desteklenmiyor"
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all bir depo argümanı almıyor"
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor"
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s"
+msgid "no such remote or remote group: %s"
+msgstr "böyle bir uzak konum veya uzak konum grubu yok: %s"
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
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:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor."
-
#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor"
+
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
"ile kullanılabilir."
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
msgstr ""
"git fmt-merge-msg [-m <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "günlüğü kısa günlükten en az <n> girdi ile doldur"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "--log için arma (kullanılmamalı)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "metin"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "iletinin başlangıcı olarak <metin> kullan"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "gerçek hedef dal yerine <ad> kullan"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "okunacak dosya"
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<işleme>]] [--no-contains [<işleme>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "yer tutucuları perl'in anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "yer tutucuları python'un anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "yer tutucuları Tcl'nin anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "yalnızca <n> eşleşen başvuruyu göster"
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr "biçim renklerine uy"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "yalnızca verilen nesneye işaret eden başvuruları yazdır"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "yalnızca birleştirilen başvuruları yazdır"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "yalnızca birleştirilmemiş başvuruları yazdır"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "yalnızca işlemeyi içeren başvuruları yazdır"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
msgid "%s: object is of unknown type '%s': %s"
msgstr "%s: nesne bilinmeyen bir türde: '%s': %s"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: nesne ayrıştırılamadı: %s"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "hatalı sha1 dosyası: %s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Nesne dizini denetleniyor"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Nesne dizinleri denetleniyor"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "%s bağ denetleniyor"
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "geçersiz %s"
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s garip bir şeye işaret ediyor (%s)"
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Önbellek ağacı denetleniyor"
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "cache-tree içinde ağaç olmayan öge"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<seçenekler>] [<nesne>...]"
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "ulaşılamayan nesneleri göster"
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "sarkan nesneleri göster"
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "etiketleri bildir"
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "kök düğümleri bildir"
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "indeks nesnelerini dal ucu düğümü yap"
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "yalnızca bağlanabilirliği denetle"
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "daha kesin denetlemeyi etkinleştir"
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "sarkan nesneleri .git/lost-found'a yaz"
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "ilerlemeyi göster"
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Nesneler denetleniyor"
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: nesne kayıp"
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
msgid "failed to parse '%s' value '%s'"
msgstr "'%s' değeri '%s' ayrıştırılamadı"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "'%s' bilgileri alınamıyor"
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "'%s' okunamıyor"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "başvurulmayan nesneleri buda"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "auto-gc kipini etkinleştir"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gc.logexpiry değeri %s ayrıştırılamadı"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "'prune expiry' değeri %s ayrıştırılamadı"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "En iyi başarım için depo arka planda kendiliğinden paketleniyor.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "En iyi başarım için depo kendiliğinden paketleniyor.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "El ile ortalık temizliği için \"git help gc\"ye bakın.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
"force kullanın)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Çok fazla ulaşılabilir boşta nesne var; kaldırmak için 'git prune' kullanın."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<görev>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule kullanımına izin yok"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "tanımlanamayan --schedule argümanı, %s"
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "commit-graph yazılamadı"
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "uzak konumlar önden getirilemedi"
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr "'git pack-objects' işlemi başlatılamadı"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr "'git pack-objects' işlemi bitirilemedi"
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "multi-pack-index yazılamadı"
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' başarısız oldu"
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' başarısız oldu"
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "'%s' görevi başarısız oldu"
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' geçerli bir görev değil"
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "'%s' görevi birden çok kez seçilemez"
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "görevleri deponun durumuna göre çalıştır"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "sıklık"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "görevleri sıklığa göre çalıştır"
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr "görev"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "belirli bir görevi çalıştır"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan"
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "'git config' çalıştırılamadı"
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "'%s' yolu oluşturulamadı"
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "launchctl başlatılamadı"
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "'%s' için dizinler oluşturulamadı"
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "%s servisi özyüklenemedi"
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "geçici xml dosyası oluşturulamadı"
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "schtasks başlatılamadı"
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "'crontab' stdin'i açılamadı"
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' beklenmedik bir biçimde sonlandı"
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr "systemctl başlatılamadı"
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr "systemctl çalıştırılamadı"
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
msgstr "'%s' silinemedi"
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr "tanımlanamayan --scheduler argümanı, '%s'"
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr "ne systemd zamanlayıcıları ne de crontab mevcut değil"
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr "%s planlayıcısı mevcut değil"
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "başka bir işlem arka plan bakımı zamanını planlıyor"
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr "git maintenance start [--scheduler=<görev-planlayıcı>]"
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr "görev planlayıcı"
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr "git bakımını tetikleyecek görev planlayıcı"
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "depo, global yapılandırmaya eklenemedi"
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <altkomut> [<seçenekler>]"
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "geçersiz altkomut: %s"
msgid "unrecognized help format '%s'"
msgstr "tanımlanamayan yardım biçimi '%s'"
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "emacsclient başlatılamadı."
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "emacsclient sürümü ayrıştırılamadı."
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient sürümü '%d' pek eski (<22)."
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr "'%s' çalıştırılamadı"
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
"Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
"Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': Bilinmeyen man görüntüleyicisi."
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "isteğe hiçbir man görüntüleyicisi ele almadı"
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı"
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s', '%s' olarak armalanmış"
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "hatalı alias.%s dizisi: %s"
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr "bu seçenek başka bir argüman daha almıyor"
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "kullanım: %s%s"
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "ek bilgi için: 'git help config'"
msgid "unknown hash algorithm '%s'"
msgstr "bilinmeyen sağlama algoritması '%s'"
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin bir git dizini gerektirir"
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format, --stdin olmadan kullanılamaz"
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify ile bir paket dosyası adı verilmedi"
msgid "specify the hash algorithm to use"
msgstr "kullanılacak sağlama algoritmasını belirle"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir ve --bare birlikte kullanılamaz"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "Son çıktı: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: hatalı dosya"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "%s nesnesi okunamadı"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "bilinmeyen tür: %d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: açıklama kipinden geçersiz kapak sayfası"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "format.headers değere iye değil"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "%s yama dosyası okunamıyor"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "bir tam erim gerekiyor"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "bir erim değil"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "ön yazı için e-posta biçimi gerekli"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "cover-letter dosyası oluşturulamadı"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "akıl almaz in-reply-to: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "iki çıktı dizini?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "bilinmeyen işleme %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
"kullanarak el ile belirtebilirsiniz."
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "taban işlemesi revizyon listesinin atası olmalı"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "taban işlemesi revizyon listesinde olmamalı"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "yama numarası alınamıyor"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "birden çok yama bile olsa [PATCH] kullan"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "yamaları standart çıktıya yazdır"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "bir ön yazı oluştur"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr "çıktı dosya adları için yalın sayı dizisi oluştur"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "sonek"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' yerine <sonek> kullan"
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr "reroll-count"
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "diziyi n. deneme olarak imle"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "[PATCH] yerine [RFC PATCH] kullan"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "açıklama kipinden kapak sayfası kipi"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] yerine [<önek>] kullan"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "ortaya çıkan dosyaları <dizin>'de depola"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]'i soyma/ekleme"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "ikili diff'leri çıktı verme"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr "öntanımlı yerine yama biçimini göster (patch + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "İletileşme"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "üstbilgi"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "e-posta üstbilgisi ekle"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "e-posta"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "To: üstbilgisi ekle"
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "Cc: üstbilgisi ekle"
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "tanımlayıcı"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "ileti no"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr "ilk postayı <ileti no>'ya bir yanıt yap"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "sınır"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "yamayı ekle"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "yamayı iletiye koy"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "imza"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "imza ekle"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "taban işleme"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "yama dizisine önkoşul ağaç bilgisini ekle"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "dosyadan bir imza ekle"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "yama dosya adlarını yazdırma"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr "yamalar oluşturulurken ilerlemeyi göster"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "oluşumun tartıldığı yüzde"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "geçersiz tanımlayıcı satırı: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "--name-only bir anlam ifade etmiyor"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "--name-status bir anlam ifade etmiyor"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "--check bir anlam ifade etmiyor"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output ve --output-directory birlikte kullanılamaz"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff v%d karşısında:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor, --range-diff gerektiriyor"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff v%d karşısında:"
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' imza dosyası okunamıyor"
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "Yamalar oluşturuluyor"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "çıktı dosyaları oluşturulamadı"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<seçenekler>] [<dosya>...]"
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr "yolları NUL karakteri ile ayır"
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "dosya durumunu etiketlerle tanımla"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "silinen dosyaları çıktıda göster"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "değiştirilen dosyaları çıktıda göster"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "diğer dosyaları çıktıda göster"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "yok sayılan dosyaları çıktıda göster"
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "hazırlanan içeriğin nesne adını çıktıda göster"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "'diğer' dizinlerin yalnızca adını göster"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "dosyaların satır sonlarını göster"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "boş dizinleri gösterme"
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "birleştirilmemiş dosyaları çıktıda göster"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "'resolve-undo' bilgisini göster"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "dizgi ile eşleşen dosyaları atla"
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr "hariç bırakma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "standart git hariç tutmalarını ekle"
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "çıktıyı en üst proje dizinine göreceli olarak yap"
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "altmodüller içinden özyinele"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "eğer bir <dosya> indekste değilse bunu bir hata olarak gör"
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "ağacımsı"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "hata ayıklama verisini göster"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "yinelenen girdileri sustur"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "bir aralıklı indeks bulunurluğunda aralıklı dizinleri göster"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr "diff3 tabanlı birleştirme kullan"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "gayretli bir diff3 tabanlı birleştirme kullan"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "çakışmalarda bizim sürümü kullan"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "çakışmalarda onların sürümünü kullan"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "çakışmalarda birlik olmuş bir sürüm kullan"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "çakışmalarda bu imleyici boyutunu kullan"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "çakışmalar hakkında uyarma"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "file1/orig-file/file2 için etiketler yapıştır"
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<seçenekler>] [<işleme>...]"
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "'m' anahtarı bir değer gerektiriyor"
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "'%s' seçeneği bir değer gerektiriyor"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Kullanılabilir stratejiler:"
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Kullanılabilir özel stratejiler:"
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "birleştirmenin sonunda bir diffstat gösterme"
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "birleştirmenin sonunda bir diffstat göster"
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(--stat eşanlamlısı)"
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"kısa günlükten birleştirme işlemesi iletisine girdiler (en çok <n>) ekle"
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "birleştirme yerine tek bir işleme oluştur"
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "birleştirme başarılı olursa bir işleme gerçekleştir (öntanımlı)"
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "göndermeden önce iletiyi düzenle"
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "ileri sarıma izin ver (öntanımlı)"
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "ileri sarım olanaklı değilse iptal et"
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "adı verilen işlemenin geçerli bir GPG imzası olduğunu doğrula"
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strateji"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "kullanılacak birleştirme stratejisi"
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "seçenek=değer"
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "seçili birleştirme stratejisi için seçenekler"
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"birleştirme işlemesi iletisi (ileri sarım olmayan bir birleştirme için)"
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "gerçek hedef yerine <ad> kullan"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort; ancak indeksi ve çalışma ağacını değiştirmeden bırakın"
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "pre-merge-commit ve commit-msg kancalarını atla"
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "zula yapılamadı"
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "zulalama başarısız oldu"
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "geçerli bir nesne değil: %s"
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree başarısız oldu"
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Tümü güncel (tıkıştırılacak bir şey yok)."
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' bir işlemeye işaret etmiyor"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor."
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr "bilinmeyen strateji seçeneği: -X%s"
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "%s yazılamıyor"
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Şu konumdan okunamadı: '%s'"
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Birleştirme işlenmiyor, tamamlamak için 'git commit' kullanın.\n"
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
"\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n"
"iptal eder.\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "Boş işleme iletisi."
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "Harika.\n"
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu işleyin.\n"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "Geçerli dal yok."
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "Geçerli dal için uzak konum yok."
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "%s için %s konumundan uzak izleme dalı yok"
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Hatalı değer '%s', '%s' ortamında"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "birleştirebileceğimiz bir şey değil"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "--abort bir argüman beklemez"
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "--quit bir argüman beklemez"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "--continue bir argüman beklemez"
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n"
"Lütfen birleştirmeden önce değişikliklerinizi işleyin."
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n"
"Lütfen birleştirmeden önce değişikliklerinizi işleyin."
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)."
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "--squash ile --no-ff birlikte kullanılamaz."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "--squash ile --commit birlikte kullanılamaz."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"İleri sarım olmayan işlemeyi boş dal ucuna yapmak bir anlam ifade etmiyor"
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - birleştirebileceğimiz bir şey değil"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "Güncelleniyor: %s..%s\n"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "Yok.\n"
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "%s birleştirme stratejisi deneniyor...\n"
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "El ile çözümü hazırlamak için %s stratejisi kullanılıyor.\n"
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "tag on stdin did not refer to a valid object"
msgstr "stdin üzerindeki etiket geçerli bir nesneye başvurmuyor"
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr "etiket dosyası yazılamıyor"
msgid "refs snapshot for selecting bitmap commits"
msgstr "biteşlem işlemeleri seçmek için başvuruların anlık görüntüsünü al"
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr "%s, %s olarak yeniden adlandırılıyor\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s' yeniden adlandırılamadı"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<seçenekler>] <işleme>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<seçenekler>] --all"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<seçenekler>] --stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr "yalnızca başvuru tabanlı adları yazdır (nesne adı yok)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr "işlemeleri adlandırmak için yalnızca etiketleri kullan"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr "yalnızca <dizgi> ile eşleşen başvuruları kullan"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr "<dizgi> ile eşleşen başvuruları yok say"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr "tüm başvurulardan ulaşılabilir olan tüm işlemeleri listele"
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr "stdin'den oku"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr "'tanımlanmayan' adların yazdırılmasına izin ver (öntanımlı)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)"
msgid "Write/edit the notes for the following object:"
msgstr "Aşağıdaki nesneler için not yaz/düzenle:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "'%s' nesnesi için 'show' başlatılamıyor"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "'show' çıktısı okunamadı"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "'%s' nesnesi için 'show' bitirilemedi"
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "not içeriğini lütfen -m veya -F seçeneğini kullanarak sağlayın"
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "not nesnesi yazılamıyor"
msgid "the note contents have been left in %s"
msgstr "not içeriği %s içinde bırakıldı"
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s' açılamadı veya okunamadı"
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr "çok fazla argüman"
msgid "Overwriting existing notes for object %s\n"
msgstr "%s nesnesi için var olan notların üzerine yazılıyor\n"
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s nesnesi için olan not kaldırılıyor\n"
msgid "unknown -s/--strategy: %s"
msgstr "bilinmeyen -s/--strategy: %s"
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "%s konumuna bir not birleştirmesi halihazırda %s konumunda sürüyor"
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "geçerli not başvurusuna bağlantı depolanamadı (%s)"
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"çözün ve sonucu 'git notes merge --commit' ile işleyin. Birleştirmeyi iptal "
"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n"
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "%s nesnesinin notu yok\n"
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "var olmayan notu kaldırma denemesi bir hata değil"
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "nesne adlarını standart girdi'den oku"
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "kaldırma, yalnızca göster"
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "budanmış notları kaldır"
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "not başvurusu"
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "notları <not-bşvr>'ndan kullan"
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr "bilinmeyen altkomut: %s"
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "--filter, --stdout olmadan kullanılamaz"
msgid "Enumerating objects"
msgstr "Nesneler ortaya dökülüyor"
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgstr ""
"git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "budanmış nesneleri bildir"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "promisor paket dosyalarının dışındaki nesnelere taramayı kısıtla"
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "bir precious-objects deposu içinde budama yapılamıyor"
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr "pre-merge-commit ve commit-msg kancalarının kullanımını denetle"
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
msgstr "<uzak-konum>"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "<dal>"
msgid "ignoring --verify-signatures for rebase"
msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"belirtmeniz gerekiyor. Bunu bir sonraki çekimden önce\n"
"aşağıdaki komutlardan birini çalıştırarak yapabilirsiniz:\n"
"\n"
-"\tgit config pull.rebase false # birleştir (öntanımlı strateji)\n"
+"\tgit config pull.rebase false # birleştir\n"
"\tgit config pull.rebase true # yeniden temellendir\n"
-"\tgit config pull.ff only # yalnızca ileri sarım\n"
+"\tgit config pull.ff only # yalnızca ileri sar\n"
"\n"
"Tüm depolar için global bir tercih ayarlamak için \"git config\"i\n"
"\"git config --global\" ile değiştirebilirsiniz. Öntanımlı\n"
"yapılandırmayı yürütme sırasında --rebase, --no-rebase veya\n"
"--ff-only ile bir kerelik geçersiz kılabilirsiniz.\n"
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "yeniden temellendirme ile çekim"
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"Çalışma ağacınız %s işlemesinden\n"
"ileri sarılıyor."
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"komutunu çalıştırın."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "Boş dal ucuna birden çok dal birleştirilemez."
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "Birden çok dala yeniden temellendirme yapılamaz."
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr "Birden çok dala ileri sarım yapılamaz."
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr "Iraksak dalların nasıl uzlaştırılacağının belirtilmesi gerekiyor."
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
"to integrate those changes locally (e.g., 'git pull ...')\n"
"before forcing an update.\n"
msgstr ""
-"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son çıkıştan bu\n"
-"yana güncellenmiş. Bir güncellemeyi zorlamadan önce bu değişiklikleri yerel\n"
-"olarak entegre etmek isteyebilirsiniz (örn. 'git pull ...'\n"
+"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son\n"
+"çıkıştan bu yana güncellenmiş. Bir güncellemeyi zorlamadan\n"
+"önce bu değişiklikleri yerel olarak entegre etmek isteye-\n"
+"bilirsiniz (örn. 'git pull ...'\n"
#: builtin/push.c:355
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "bazı başvurular '%s' konumuna itilemedi"
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "depo"
msgid "request atomic transaction on remote side"
msgstr "uzak tarafta atomsal işlem iste"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete bir başvuru olmadan anlam ifade etmiyor"
"\n"
"\tgit push <ad>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all ve --tags birbiriyle uyumsuz"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror ve --tags birbiriyle uyumsuz"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all ve --mirror birbiriyle uyumsuz"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "--preserve-merges, --rebase-merges olarak değiştirildi"
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "--keep-base ile --onto birlikte kullanılamaz"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "--keep-base ile --root birlikte kullanılamaz"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "--root ile --fork-point birlikte kullanılamaz"
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Sürmekte olan bir yeniden temellendirme yok"
msgstr "--strategy, --merge veya --interactive gerektiriyor"
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor"
+msgid "apply options and merge options cannot be used together"
+msgstr "uygulama seçenekleri ve birleştirme seçenekleri birlikte kullanılamaz"
#: builtin/rebase.c:1476
#, c-format
msgstr "böyle bir dal/işleme yok: '%s'"
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "Böyle bir başvuru yok: %s"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dizini>"
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı güncelleme\n"
-"reddedilir; çünkü bu indeksi ve çalışma ağacını ittiğinizle tutarsız\n"
-"duruma getirir ve çalışma ağacını HEAD ile eşleştirmek için\n"
-"'git reset --hard' gerektirir.\n"
-"Geçerli dalına itmeye izin vermek için uzak depodaki 'receive."
-"denyCurrentBranch'\n"
-"yapılandırma değişkenini 'ignore' veya 'warn' olarak ayarlayabilirsiniz,\n"
-"ancak bu onun çalışma ağacını ittiğinizle eşleştirecek bir yol bulmadığınız\n"
-"sürece önerilmez.\n"
-"Bu iletiyi susturup öntanımlı davranışı tutmak için 'receive."
-"denyCurrentBranch'\n"
-"yapılandırma değişkenini 'refuse' olarak ayarlayın."
-
-#: builtin/receive-pack.c:1300
+"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı\n"
+"güncelleme reddedilir; çünkü bu indeksi ve çalışma ağacını\n"
+"ittiğinizle tutarsız duruma getirir ve çalışma ağacını HEAD\n"
+"ile eşleştirmek için 'git reset --hard' gerektirir.\n"
+"Geçerli dalına itmeye izin vermek için uzak depodaki\n"
+"'receive.denyCurrentBranch' yapılandırma değişkenini 'ignore'\n"
+"veya 'warn' olarak ayarlayabilirsiniz; ancak bu onun çalışma\n"
+"ağacını ittiğinizle eşleştirecek bir yol bulmadığınız sürece\n"
+"önerilmez. Bu iletiyi susturup öntanımlı davranışı tutmak için\n"
+"'receive.denyCurrentBranch' yapılandırma değişkenini 'refuse'\n"
+"olarak ayarlayın."
+
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-"Öntanımlı olarak, geçerli dalı silme reddedilir; çünkü bir sonraki 'git "
-"clone'\n"
-"hiçbir dosyanın çıkış yapılamamasına neden olup karmaşa doğurur.\n"
+"Öntanımlı olarak, geçerli dalı silme reddedilir; çünkü bir\n"
+"sonraki 'git clone' hiçbir dosyanın çıkış yapılamamasına\n"
+"neden olup karmaşa doğurur.\n"
+"\n"
+"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan\n"
+"silinebilmesine izin vermek için uzak depodaki\n"
+"'receive.denyDeleteCurrent' yapılandırma değişkenini 'warn'\n"
+"veya 'ignore' olarak ayarlayabilirsiniz.\n"
"\n"
-"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan silinebilmesine izin\n"
-"vermek için uzak depodaki 'receive.denyDeleteCurrent' yapılandırma\n"
-"değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n"
"Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "sessiz"
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Bir dizin belirtmelisiniz."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "bir dizin belirtmelisiniz"
#: builtin/reflog.c:17
msgid ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists <başvuru>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' geçerli bir zaman damgası değil"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "Ulaşılabilir nesneler imleniyor..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "%s hiçbir yere işaret etmiyor!"
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "silmek için bir başvuru günlüğü belirtilmedi"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "bir başvuru günlüğü değil: %s"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "'%s' için başvuru günlüğü yok"
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "geçersiz başvuru biçimi: %s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
msgid "Updating %s"
msgstr "%s güncelleniyor"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "%s getirilemedi"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
"Artan yeniden paketlemeler biteşlem indeksleri ile uyumsuzdur.\n"
-"--no-write-bitmap-index kullanın veya pack.writebitmaps yapılandırmasını\n"
-"devre dışı bırakın."
+"--no-write-bitmap-index kullanın veya pack.writebitmaps\n"
+"yapılandırmasını devre dışı bırakın."
#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı"
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor."
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "%s için indeks açılamıyor"
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük"
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "%s paketi, sarmak için pek büyük"
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "geçici dosya '%s', yazma için açılamadı"
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı"
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "her şeyi tek bir pakete sığdır"
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır"
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-delta geçir"
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-object geçir"
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "'git-update-server-info' çalıştırma"
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "--local'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "biteşlem indeksi yaz"
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "yaklaşık tarih"
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr "-A ile, bundan daha eski nesneleri bırakma"
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "delta sıkıştırması için kullanılan pencerenin boyutu"
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "baytlar"
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr "yukarıdakiyle aynı; ancak girdi sayısı yerine bellek boyutunu kısıtla"
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "olabilecek en büyük delta derinliğini kısıtlar"
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "iş parçacıklarının olabilecek en büyük sayısını kısıtlar"
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "her paket dosyasının olabilecek en büyük boyutu"
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle"
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "bu paketi yeniden paketleme"
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "<N> faktörlü bir geometrik ilerleme bul"
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz"
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "bir precious-objects deposundaki paketler silinemiyor"
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric, -A ve -a ile uyumsuz"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "Paketlenecek yeni bir şey yok."
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "gereken dosya eksik: %s"
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "bağlantı kaldırılamadı: %s"
msgid "unable to open %s for reading"
msgstr "%s okuma için açılamıyor"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "mktree ortaya çıkarılamıyor"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "mktree'den okunamıyor"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree hata bildirdi"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree bir nesne adı döndürmedi"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "%s 'fstat' yapılamıyor"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "nesne veritabanına yazılamıyor"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "geçerli bir nesne adı değil: '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "%s için nesne türü alınamadı"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "nesne dosyasını düzenleme başarısız"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "yeni nesne eskisiyle aynı: '%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "%s, bir işleme olarak ayrıştırılamadı"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "'%s' işlemesinde hatalı birleştirme etiketi"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "'%s' işlemesinde hatalı oluşturulmuş birleştirme etiketi"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"'%s' orijinal işlemesi atılmış olan '%s' birleştirme etiketini içeriyor; --"
"graft yerine --edit kullanın"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "'%s' orijinal işlemesinin bir gpg imzası var"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "imza, yerine geçecek işlemede kaldırılacak"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "şunun yerine geçecek işleme yazılamadı: '%s'"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "'%s' için aşı gereksiz"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "yeni işleme eskisiyle aynı: '%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"aşağıdaki aşı(lar) dönüştürülemedi:\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "değiştirme başvurularını listele"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "değiştirme başvurularını sil"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "geçerli nesneyi düzenle"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "bir işlemenin üst ögelerini değiştir"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "mevcut aşı dosyasını dönüştür"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "başvuru mevcutsa onu değiştir"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "--edit içeriğini hoş biçimde gösterme"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "bu biçimi kullan"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format, listelemiyorken kullanılamaz"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f yalnızca yerine geçecek bir nesne yazılırken anlam ifade eder"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw yalnızca --edit ile anlam ifade eder"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d için en azından bir argüman gerekli"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "hatalı argüman sayısı"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e için tam olarak bir argüman gerekli"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g için en azından bir argüman gerekli"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file argüman almaz"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "-l ile yalnızca bir dizgi verilebilir"
msgid "unable to generate diff for '%s'"
msgstr "'%s' için diff oluşturulamıyor"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<işleme>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<ağacımsı>] [--] <yol-blrtç>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ağacımsı>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<ağacımsı>] [--] [<yol-blrtç>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "karışık"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "yumuşak"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "sert"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "birleştir"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "tut"
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Geçerli bir HEAD'iniz yok."
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "HEAD ağacı bulunamadı."
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "%s ağacı bulunamadı."
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD şimdi şurada: %s"
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Bir birleştirmenin ortasında %s sıfırlaması yapılamıyor."
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "sessiz ol, yalnızca hataları bildir"
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "HEAD'i ve indeksi sıfırla"
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "yalnızca HEAD'i sıfırla"
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla"
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr ""
"yalnızca kaldırılan yolların daha sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "'%s' geçerli bir revizyon olarak çözülemedi."
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "'%s' geçerli bir ağaç olarak çözülemedi."
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"belirtilmiş yol ile --mixed artık eski; yerine 'git reset -- <yollar>' "
"kullanın."
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor."
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s sıfırlamasına çıplak bir depoda izin verilmiyor"
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N yalnızca --mixed ile birlikte kullanılabilir"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"sürdü. Bundan kaçınmak için --quiet kullanabilir, öntanımlı yapmak içinse\n"
"reset.quiet yapılandırma değişkenini 'true' olarak değiştirebilirsiniz.\n"
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı."
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "Yeni indeks dosyası yazılamadı."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "nesne süzme --objects gerektiriyor"
msgstr "rev-list not görüntülemesini desteklemiyor"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "imlenmiş sayım, --objects ile uyumsuz"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "imli sayım ve '%s' birlikte kullanılamaz"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgid "show <n> most recent ref-log entries starting at base"
msgstr "tabanda başlayarak en yeni <n> başvuru günlüğü girdilerini göster"
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog; --all, --remotes, --independent veya --merge-base ile uyumsuz"
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "dal verilmedi ve HEAD geçersiz"
msgid "no such ref %s"
msgstr "böyle bir başvuru yok: %s"
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "%d revizyondan başkası ele alınamıyor."
msgstr[1] "%d revizyondan başkası ele alınamıyor."
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' geçerli bir başvuru değil."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "%s işlemesi bulunamıyor (%s)"
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "bu çalışma ağacı aralıklı değil"
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)"
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"'%s' dizini izlenmeyen dosyalar içeriyor; ancak aralıklı çıkış konisinde "
"değil"
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr "'%s' dizini kaldırılamadı"
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "depo biçimi worktreeConfig etkinleştirmesi için yükseltilemiyor"
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "sparse-index yapılandırması değiştirilemedi"
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
msgstr "aralıklı çıkışı koni kipinde ilklendir"
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
-msgstr "bir aralıklı indeksin kullanımını aç/kapa"
-
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "sparse-index yapılandırması değiştirilemedi"
+msgstr "bir aralıklı indeksin kullanımını aç/kapat"
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr "'%s' açılamadı"
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr "'%s' yolu olağanlaştırılamadı"
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor"
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "mevcut aralıklı çıkış dizgileri koni kipini kullanmıyor"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <dizgiler>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
msgid "read patterns from standard in"
msgstr "dizgileri stdin'den oku"
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "kendisine eklenecek bir aralıklı çıkış yok"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<dizgiler>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+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ış "
+"içinde olmalı"
+
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr "çalışma dizini yenilenirken hata"
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
" [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
" [--] [<yol-blrtç>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<ileti>]"
#: builtin/stash.c:55
msgid "Index was not unstashed."
msgstr "İndeks zuladan çıkartılmamıştı."
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "indeks yeniden oluşturulmaya çalışılıyor"
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s bırakıldı (%s)"
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Zula girdisi bırakılamadı"
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bir zula başvurusu değil"
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "Dal adı belirtilmedi"
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "ağaç ayrıştırılamadı"
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "ağaçların paketi açılamadı"
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "zulada yalnızca izlenmeyen dosyaları göster"
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "%s, %s ile güncellenemiyor"
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "zula iletisi"
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Hazırlanan değişiklik yok"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "Değişiklik seçilmedi"
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "Henüz ilk işleme yapılmamış"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "Geçerli indeks durumu kaydedilemiyor"
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "İzlenmeyen dosyalar kaydedilemiyor"
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Geçerli hazırlananlar durumu kaydedilemiyor"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor"
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "--staged, --include-untracked veya --all hepsi bir anda kullanılamıyor"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "'git add' yapmayı mı unuttunuz?"
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "Kaydedilecek yerel değişiklik yok"
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "Zula ilklendirilemiyor"
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "Geçerli durum kaydedilemiyor"
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "indeksi tut"
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "yalnızca hazırlanan değişiklikleri zulala"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "yama kipinde zula"
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "sessiz kip"
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "yok sayma dosyalarını içer"
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr "her satırın başına yorum karakteri ve boşluk koy"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
"varsayılıyor."
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr "göreceli yollar için alternatif tutturucu"
msgstr ""
"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
"sıfır olmayan durum döndürdü"
+"."
#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgid "failed to recurse into submodule '%s'"
msgstr "'%s' altmodülüne özyinelenemedi"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "altmodül durum çıktısını gizle"
msgid "could not fetch a revision for HEAD"
msgstr "HEAD için bir revizyon getirilemedi"
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached ve --files birlikte kullanılamaz"
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil "
-"olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)"
+"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor. Bu, absorbgitdirs "
+"kullanılarak bir .git dosyası ile değiştirilecek."
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için "
"'-f' kullanın"
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "'%s' dizini temizlendi\n"
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n"
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "boş altmodül dizini %s oluşturulamadı"
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n"
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "tüm altmodüllerin kaydını kaldır"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' "
"kullanın"
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
"--reference yerine --reference-if-able kullanarak klonlayın."
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "'%s' altmodülü alternatif ekleyemiyor: %s"
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı"
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor"
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız"
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr "dizin boş değil: '%s'"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s' için altmodül dizini alınamadı"
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "yeni altmodülün nereye klonlanacağı"
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "yeni altmodülün adı"
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr "altmodülün klonlanacağı url konumu"
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "sığ klonların derinliği"
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "zorla klonla"
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "boş olmayan dizine klonlamaya izin verme"
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için"
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış"
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Altmodül yolu '%s' ilklendirilmedi"
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init' mi kullanmak istersiniz?"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Birleştirilmemiş altmodül %s atlanıyor"
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "'%s' altmodülü atlanıyor"
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor"
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "Şu altmodül yolunda '%s' çıkışı yapılamadı: '%s'"
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "Şu altmodül yolunda '%s' yeniden temellendirilemedi: '%s'"
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "Şu altmodül yolunda '%s' birleştirilemedi: '%s'"
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "Şu altmodül yolunda '%s %s' çalıştırılamadı: '%s'"
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "Altmodül yolu '%s': '%s' çıkışı yapıldı\n"
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "Altmodül yolu '%s': '%s' üzerine yeniden temellendirildi\n"
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "Altmodül yolu '%s': '%s' içinde birleştirildi\n"
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "Altmodül yolu '%s': '%s %s'\n"
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
"'%s' altmodül yolunda getirme yapılamadı; %s doğrudan getirilmeye "
"çalışılıyor:"
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"'%s' altmodül yolunda getirme yapıldı; ancak %s içermiyor. Bu işlemenin "
"doğrudan getirilmesi başarısız oldu."
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "çalışma ağacına giden yol"
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol"
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout veya none"
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur"
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "paralel işler"
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "klonlama işlemini yazdırma"
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]"
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "güncelleme parametresi için hatalı değer"
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr "güncelleme çıktısını yeniden temellendirme veya birleştirme ile sustur"
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr "güncellemeleri zorla çıkış yap"
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr "yeni nesneleri uzak konumdan getirme"
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr ""
"deponun taze bir klon olması durumunda güncelleme kipini geçersiz kılar"
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr "sığ getirme derinliği"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr "sha1"
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr "superproject tarafından SHA1 bekleniyordu"
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr "subsha1"
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr "altmodülün HEAD'inin SHA1'i"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr "git submodule--helper run-update-procedure [<seçenekler>] [<yol>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak "
"süperproje herhangi bir dalda değil"
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "'%s' altmodülü için depo tutacağı alınamadı"
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "altmodüllere özyinele"
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle"
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır"
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <ad> [<değer>]"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <ad>"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol"
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "bir altmodül url ayarlanması çıktısını gizle"
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "öntanımlı izleme dalını master olarak ayarla"
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "öntanımlı izleme dalını ayarla"
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>"
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "--branch veya --default gerekli"
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch ve --default birlikte kullanılamaz"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n"
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' halihazırda mevcut ve geçerli bir git deposu değil"
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:\n"
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"depo değilse veya bunun ne anlama geldiğinden emin değilseniz\n"
"'--name' seçeneği ile başka bir ad seçin."
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "'%s' altmodülü için yerel git dizini yeniden etkinleştiriliyor\n"
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "'%s' altmodülü çıkış yapılamıyor"
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "'%s' altmodülü eklenemedi"
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "'%s' altmodülü kaydı yapılamadı"
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr "'%s' indekste halihazırda var"
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "'%s' indekste halihazırda var ve bir altmodül değil"
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr "altmodül olarak eklenecek depo dalı"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr "başka bir durumda yok sayılan altmodül yolunun eklenmesine izin ver"
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr "yalnızca hata iletilerini yazdır"
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr "nesneleri başvuru depolarından ödünç al"
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr ""
"altmodülün adını kendi yoluna öntanımlamak yerine verilen dizi olarak ayarlar"
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]"
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir"
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr "depo URL'si: '%s' mutlak olmalı veya ./|../ ile başlamalıdır"
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' geçerli bir altmodül adı değil"
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s, --super-prefix desteklemiyor"
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
"'%c' ile başlayan satırlar tutulacaktır; isterseniz onları "
"kaldırabilirsiniz.\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "etiket imzalanamıyor"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
-msgstr "hatalı nesne türü"
+msgstr "hatalı nesne türü."
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "etiket iletisi yok mu?"
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Etiket iletisi %s içinde bırakıldı\n"
msgid "print only tags of the object"
msgstr "yalnızca nesnenin etiketlerini yazdır"
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column ve -n birbiriyle uyumsuz"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-"--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "yalnızca bir -F veya -m seçeneğine izin verilir"
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "'%s' seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' geçerli bir etiket adı değil."
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "'%s' etiketi halihazırda var"
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "'%s' etiketi güncellendi (%s idi)\n"
msgid "initializing"
msgstr "ilklendiriliyor"
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')"
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumundaydı)"
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr "yeni bir dal oluştur"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr "yeni bir dal oluştur veya sıfırla"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr "yeni çalışma ağacını doldur"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr "yeni çalışma ağacını kilitli tut"
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr "kilitleme nedeni"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr "izleme kipini ayarla (bkz: git-branch(1))"
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene"
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B ve --detach birlikte kullanılamaz"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason, --lock gerektiriyor"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr "--lock ile eklendi"
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle"
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose ve --porcelain birlikte kullanılamaz"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' bir çalışma ağacı değil"
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz"
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' halihazırda kilitli, nedeni: %s"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' halihazırda kilitli"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' kilitli değil"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz"
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı"
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' bir ana çalışma ağacı"
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "hedef adı şuradan anlaşılamadı: '%s'"
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n"
"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"kilitli bir çalışma ağacı taşınamıyor;\n"
"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s"
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "'%s' -> '%s' taşıması başarısız"
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı"
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force "
"kullanın"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d"
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır"
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n"
"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"kilitli bir çalışma ağacı kaldırılamıyor;\n"
"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s"
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr "şunu onar %s: %s"
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr "hata: %s: %s"
"için 'git help <komut>' veya 'git help <konsept>' yazın. Genel bir görünüm\n"
"için 'git help git' kullanabilirsiniz."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "--git-dir için dizin verilmedi\n"
+msgid "no directory given for '%s' option\n"
+msgstr "'%s' seçeneği için bir dizin verilmedi\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "--namespace için ad alanı verilmedi\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "--work-tree için dizin verilmedi\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "-C için dizin verilmedi\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr "özyineli arma: %s"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "standart çıktı'da yazma hatası"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "standart çıktı'da bilinmeyen yazma hatası"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "standart çıktı'da kapatma başarısız"
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "arma döngüsü algılandı: '%s' genişletilmesi sonlanmıyor:%s"
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "%s bir yerleşik olarak ele alınamıyor"
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"kullanım: %s\n"
"\n"
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"'%s' armasının genişletilmesi başarısız oldu; '%s' bir git komutu değil\n"
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "'%s' komutu çalıştırılamadı: %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "bir git deposu değil"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile, --index-pack-args gerektiriyor"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args yalnızca --packfile ile kullanılabilir"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "beklenmeyen seçenekler"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "derleyici bilgisi mevcut değil\n"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "bir çalışma dizini gerekiyor"
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "libc bilgisi mevcut değil\n"
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "gönüllü yazılma kaydı bulunamıyor"
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr "argümanlar"
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "şuraya geçilemedi: '%s'"
-#: list-objects-filter-options.h:95
-msgid "object filtering"
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "%s=%s yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "log.excludeDecoration yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "uzak konum HEAD'i bir dal değil: '%.*s'"
+
+#: contrib/scalar/scalar.c:317
+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"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "öntanımlı dal adı alınamadı"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "depo kaydı silinemedi"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "gönüllü kayıt dizini silinemedi"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "klonlama sonrası çıkış yapılacak dal"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "klonlama sırasında tam çalışma dizini oluştur"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "yalnızca çıkış yapılacak dalın üstverisini indir"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "'%s' dizini halihazırda var"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "'%s' için öntanımlı dal alınamadı"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "'%s' içindeki uzak konum yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "'%s' yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "tam klonlama için yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "'scalar list' argüman almıyor"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<gönüllükayıt>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <gönüllükayıt>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all veya <gönüllükayıt>; ancak ikisi değil"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git deposu '%s' içinde gitti"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <görev> [<gönüllükayıt>]\n"
+"Görevler:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "böyle bir görev yok: '%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <gönüllükayıt>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "geçerli çalışma dizinini silme reddediliyor"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "Git sürümünü içer"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "Git'in yapı seçeneklerini içer"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <komut> [<seçenekler>]\n"
+"\n"
+"Komutlar:\n"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "derleyici bilgisi mevcut değil\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "libc bilgisi mevcut değil\n"
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr "argümanlar"
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
msgstr "nesne süzümü"
#: parse-options.h:183
msgid "no-op (backward compatibility)"
msgstr "işlem yok (geriye dönük uyumluluk için)"
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr "daha ayrıntılı anlat"
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr "daha sessiz ol"
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr "iletiden boşlukları ve #yorumları çıkart"
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr "yol belirtecini dosyadan oku"
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr "anahtar"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "üzerine sıralanacak alan adı"
msgstr "Kişilerin adlarını ve e-posta adreslerini göster"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Dal değiştir veya çalışma ağacını eski haline geri getir"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Dosyaları indeksten çalışma ağacına kopyala"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Henüz üstkaynağa uygulanmayan işlemeleri bul"
msgstr "İşleme iletilerine düzenli bilgi ekle veya ayrıştır"
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git depo tarayıcısı"
-
-#: command-list.h:117
msgid "Show commit logs"
msgstr "İşleme günlüklerini göster"
-#: command-list.h:118
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "İndeks ve çalışma ağacındaki dosya bilgilerini göster"
-#: command-list.h:119
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Uzak bir depodaki başvuruları listele"
-#: command-list.h:120
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Bir ağaç nesnesinin içeriğini listele"
-#: command-list.h:121
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart"
-#: command-list.h:122
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Yalın UNIX mbox bölücü yazılımı"
-#: command-list.h:123
+#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "Git depo verisini eniyilemek için görevler çalıştır"
-#: command-list.h:124
+#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "İki veya daha fazla geliştirme geçmişini birleştir"
-#: command-list.h:125
+#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "Birleştirme için olabildiğince en iyi ortak ataları bul"
-#: command-list.h:126
+#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "Bir 3 yönlü dosya birleştirmesi çalıştır"
-#: command-list.h:127
+#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "Birleştirilmesi gereken dosyaları birleştir"
-#: command-list.h:128
+#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "Bu yardımcı program git-merge-index kullanımı içindir"
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
+
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır"
#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "multi-pack-index doğrula ve yaz"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Ek doğrulamalı bir etiket nesnesi oluştur"
-#: command-list.h:133
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "ls-tree biçimli metinden bir ağaç nesnesi yap"
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "multi-pack-index doğrula ve yaz"
+
+#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Dosya, dizin veya sembolik bağları taşı/yeniden adlandır"
-#: command-list.h:135
+#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "Verilen revizyonlar için sembolik adları bul"
-#: command-list.h:136
+#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "Nesne notları ekle veya incele"
-#: command-list.h:137
+#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "Perforce depolarından içe aktar ve onlara gönder"
-#: command-list.h:138
+#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "Paketlenmiş bir nesne arşivi oluştur"
-#: command-list.h:139
+#: command-list.h:138
msgid "Find redundant pack files"
msgstr "Gereksiz paket dosyalarını bul"
-#: command-list.h:140
+#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "Etkili depo erişimi için dal uçları ve etiketler paketle"
-#: command-list.h:141
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Bir yama için eşi olmayan numara hesapla"
-#: command-list.h:142
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "Ulaşılamayan tüm nesneleri nesne veritabanından buda"
-#: command-list.h:143
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Halihazırda paket dosyalarında olan ek nesneleri kaldır"
-#: command-list.h:144
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Başka bir depo veya yerel daldan getir ve entegre et"
-#: command-list.h:145
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "İlişkin nesnelerle birlikte uzak başvuruları da güncelle"
-#: command-list.h:146
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Geçerli dala bir \"Quilt\" yama seti uygula"
-#: command-list.h:147
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "İki işleme erimini karşılaştır (bir dalın iki sürümü)"
-#: command-list.h:148
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Ağaç bilgisini indekse okur"
-#: command-list.h:149
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "İşlemeleri başka bir temel ucu üzerine uygula"
-#: command-list.h:150
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Depoya ne itildiyse al"
-#: command-list.h:151
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Başvuru günlüğü bilgisini yönet"
-#: command-list.h:152
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "İzlenen depolar setini yönet"
-#: command-list.h:153
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Bir depodaki paketlenmemiş nesneleri paketle"
-#: command-list.h:154
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Nesne değiştirmek için başvurular oluştur, sil, listele"
-#: command-list.h:155
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Bekleyen değişikliklerin bir özetini çıkart"
-#: command-list.h:156
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Çakışan birleştirmelerin kayıtlı çözümlerini yen. kullan"
-#: command-list.h:157
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Geçerli HEAD'i belirtilen duruma sıfırla"
-#: command-list.h:158
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Çalışma ağacı dosyalarını eski durumuna getir"
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Bazı var olan işlemeleri geri al"
-
-#: command-list.h:160
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "İşleme nesnelerini ters kronolojik sırada listele"
-#: command-list.h:161
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Parametreleri al ve üzerinde çalış"
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Bazı var olan işlemeleri geri al"
+
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Dosyaları çalışma ağacından ve indeksten kaldır"
-#: command-list.h:163
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Bir yama derlemesini e-posta olarak gönder"
-#: command-list.h:164
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Nesneleri Git protokolü üzerinden başka bir depoya it"
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Kabuk betikleri için Git'in i18n kurulum kodu"
+
#: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Ortak Git kabuk betiği kurulum kodu"
+
+#: command-list.h:166
msgid "Restricted login shell for Git-only SSH access"
msgstr "Yalnızca Git SSH erişimi için kısıtlandırılmış oturum açma kabuğu"
-#: command-list.h:166
+#: command-list.h:167
msgid "Summarize 'git log' output"
msgstr "'git log' çıktısını özetle"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show various types of objects"
msgstr "Çeşitli türlerden nesneleri göster"
-#: command-list.h:168
+#: command-list.h:169
msgid "Show branches and their commits"
msgstr "Dalları ve onların işlemelerini göster"
-#: command-list.h:169
+#: command-list.h:170
msgid "Show packed archive index"
msgstr "Paketlenmiş arşiv indeksini göster"
-#: command-list.h:170
+#: command-list.h:171
msgid "List references in a local repository"
msgstr "Yerel bir depodaki başvuruları listele"
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Kabuk betikleri için Git'in i18n kurulum kodu"
-
#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Ortak Git kabuk betiği kurulum kodu"
-
-#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Aralıklı çıkışı ilklendir ve güncelle"
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Dosya içeriğini hazırlama alanına ekle"
+
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Kirli bir çalışma dizinindeki değişiklikleri zulala"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Dosya içeriğini hazırlama alanına ekle"
-
-#: command-list.h:176
msgid "Show the working tree status"
msgstr "Çalışma ağacı durumunu göster"
-#: command-list.h:177
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Gereksiz boşlukları kaldır"
-#: command-list.h:178
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Altmodülleri ilklendir, güncelle veya incele"
-#: command-list.h:179
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Bir Subversion ve Git deposu arasında iki yönlü işlemler"
-#: command-list.h:180
+#: command-list.h:179
msgid "Switch branches"
msgstr "Dal değiştir"
-#: command-list.h:181
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Sembolik başvuruları oku, düzenle ve sil"
-#: command-list.h:182
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "GPG imzalı bir etiket oluştur, sil, listele veya doğrula"
-#: command-list.h:183
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Bir ikili nesnenin içeriği ile geçici bir dosya oluştur"
-#: command-list.h:184
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Paketlenmiş bir arşivden nesneleri çıkar"
-#: command-list.h:185
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "Çalışma ağacındaki dosya içeriğini indekse kaydet"
-#: command-list.h:186
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "Güvenlice bir başvuruda depolanan nesne adını güncelle"
-#: command-list.h:187
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Programlanamayan sunuculara destek için yardımcı veri dosyasını güncelle"
-#: command-list.h:188
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Arşivi git-archive'e geri gönder"
-#: command-list.h:189
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Nesneleri git-fetch-pack'e paketlenmiş olarak geri gönder"
-#: command-list.h:190
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Bir mantıksal Git değişkeni göster"
-#: command-list.h:191
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "İşlemelerin GPG imzasını denetle"
-#: command-list.h:192
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Paketlenmiş Git arşiv dosyalarını doğrula"
-#: command-list.h:193
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Etiketlerin GPG imzasını doğrula"
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web arabirimi (Git depoları için web ön ucu)"
-
-#: command-list.h:195
+#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr "Günlükleri her işlemenin sunduğu değişikliklerle göster"
-#: command-list.h:196
+#: command-list.h:194
msgid "Manage multiple working trees"
msgstr "Birden çok çalışma ağacını yönet"
-#: command-list.h:197
+#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr "Geçerli indeksten bir ağaç nesnesi oluştur"
-#: command-list.h:198
+#: command-list.h:196
msgid "Defining attributes per path"
msgstr "Öznitelikleri yola göre tanımla"
-#: command-list.h:199
+#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr "Git komut satırı arabirimi ve kuralları"
-#: command-list.h:200
+#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
-#: command-list.h:201
+#: command-list.h:199
msgid "Providing usernames and passwords to Git"
msgstr "Git'e kullanıcı adları ve parolalar belirt"
-#: command-list.h:202
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "CVS kullanıcıları için Git"
-#: command-list.h:203
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "diff çıktısı için ince ayarlar"
-#: command-list.h:204
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Günlük Git kullanımı için yararlı komutlar"
-#: command-list.h:205
+#: command-list.h:203
msgid "Frequently asked questions about using Git"
msgstr "Git kullanımı hakkında sıkça sorulan sorular"
-#: command-list.h:206
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Git Kavram Dizini"
-#: command-list.h:207
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Git tarafından kullanılan kancalar"
-#: command-list.h:208
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Özellikle yok sayılması istenen dosyaları belirt"
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Git depo tarayıcısı"
+
+#: command-list.h:208
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Yazar/İşleyici adlarını ve/veya e-posta adreslerini eşlemle"
-#: command-list.h:210
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Altmodül özelliklerini tanımlama"
-#: command-list.h:211
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Git ad alanları"
-#: command-list.h:212
+#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "Uzak depolar ile etkileşim için yardımcı programlar"
-#: command-list.h:213
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Git Depo Yerleşimi"
-#: command-list.h:214
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Git için revizyonları ve erimleri belirtme"
-#: command-list.h:215
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Bir depoyu bir başkasının içine bağlama"
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Git'e Giriş"
+
#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Git'e Giriş: Bölüm 2"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Git'e Giriş"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web arabirimi (Git depoları için web ön ucu)"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
-msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor"
+msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor."
#: git-submodule.sh:401
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "kullanım: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "$cdup konumuna chdir yapılamıyor, çalışma ağacının en üst düzeyi"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz"
+msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz."
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Dallar yeniden yazılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "$action yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz var."
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr "Ek olarak, indeksinizde işlenmemiş değişiklikleriniz var."
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Bu komutu çalışma ağacının en üst düzeyinden çalıştırmanız gerekiyor."
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr "Git dizininin kesin yolu algılanamıyor"
msgid "failed to open hunk edit file for reading: %s"
msgstr "parça düzenleme dosyası okuma için açılamadı: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - bu parçayı ve sonraki tüm parçaları hazırla\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - bu parçayı ve sonraki tüm parçaları zulala\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - geçerli parçayı el ile düzenle\n"
"? - yardımı yazdır\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Seçili parçalar indekse uygulanamıyor!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "birleştirilmeyenler yok sayılıyor: %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Gidilecek başka parça yok\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Geçersiz sayı: '%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Aranacak başka parça yok\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Hatalı oluşturulmuş arama düzenli ifadesi %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Verilen dizgi ile hiçbir parça eşleşmiyor\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Öncesinde parça yok\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Sonrasında parça yok\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Üzgünüm, bu parça bölünemiyor\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "%d parçaya bölündü.\n"
msgstr[1] "%d parçaya bölündü.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Üzgünüm, bu parça düzenlenemiyor\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"add untracked - izlenmeyen dosyaların içeriğini hazırlanan değişiklik setine "
"ekle\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "-- eksik"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "bilinmeyen --patch kipi: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "geçersiz argüman %s, -- bekleniyor"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' yazılan e-postayı içeriyor.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
msgstr ""
"onulmaz: 'sendmail' için yapılandırma seçenekleri bulundu\n"
"git-send-email, sendemail.* seçenekleri ile yapılandırılmıştır.\n"
-"'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini 'false'\n"
-"yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
+"'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini\n"
+"'false' yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
"yapılandırma seçeneklerinden)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Bilinmeyen --confirm ayarı: '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "uyarı: ':include:' desteklenmiyor: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
"\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n"
"\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "%s opendir yapılamadı: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"Hiçbir yama dosyası belirtilmedi!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "%s içinde konu satırı yok mu?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "%s yazma için açılamadı: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "%s açılamadı: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "%s.final açılamadı: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Özet e-postası boş, atlanıyor\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "<%s> kullanmak istediğinizden emin misiniz [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek "
"istiyorsanız --force kullanın.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "onulmaz: '%s' arması kendisine genişliyor\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer "
-"gerekliyse)?"
+"gerekliyse)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA yolu \"%s\" mevcut değil"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Sunucu STARTTLS desteklemiyor! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS başarısız oldu! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug "
"yapın."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "%s gönderilemedi\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "%s gönderilir gibi yapıldı\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "%s gönderildi\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Sınama tamam. Günlük çıktısı:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "Tamam. Günlük çıktısı:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Sonuç: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Sonuç: Tamam\n"
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "%s dosyası açılamıyor"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s' çalıştırılamadı"
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "ileti 7 bit olarak gönderilemiyor"
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "geçersiz aktarım kodlaması"
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "%s açılamıyor: %s\n"
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"onulmaz: %s:%d, 998 karakterden uzun\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s, yedek sonek '%s' ile atlanıyor.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: "
# commit message | 提交说明
# commit object | 提交对象
# commit-ish (also committish) | 提交号
+# cone | 锥形（稀疏检出模型）；锥（稀疏检出）
# conflict | 冲突
# core Git | 核心 Git 工具
# cover letter | 附函
# directory | 目录
# dirty | 脏（的工作区）
# dumb HTTP protocol | 哑 HTTP 协议
+# enlistment | 登记（在 scalar 中使用）
# evil merge | 坏合并（合并引入了父提交没有的修改）
# fast-forward | 快进
# fetch | 获取
# upstream | 上游
# upstream branch | 上游分支
# working tree | 工作区
-# Fangyi Zhou <me@fangyi.io>, 2021.
+# Fangyi Zhou <me@fangyi.io>, 2021-2022.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-10 12:16+0000\n"
+"POT-Creation-Date: 2022-01-11 09:38+0800\n"
+"PO-Revision-Date: 2022-01-11 18:18+0000\n"
"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "不能读取索引"
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "不能写入索引"
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的：%s"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "补丁更新"
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "检视 diff"
msgid "(empty) select nothing"
msgstr "（空）不选择任何内容"
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "请选择"
msgid "unstaged"
msgstr "未缓存"
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "路径"
msgid "could not refresh index"
msgstr "不能刷新索引"
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
"a - 取消暂存该块和本文件中后面的全部块\n"
"d - 不要取消暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: add-patch.c:453
#, c-format
msgid "failed to run '%s'"
-msgstr "运行 '%s' 失败"
+msgstr "无法运行 '%s'"
#: add-patch.c:612
msgid "mismatched output from interactive.diffFilter"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
msgid "The selected hunks do not apply to the index!"
msgstr "选中的块不能应用到索引！"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
msgid "No other hunks to goto"
msgstr "没有其它可供跳转的块"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
msgid "No other hunks to search"
msgstr "没有其它可供查找的块"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3way 不能同时使用。"
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way 在一个仓库之外"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index 在一个仓库之外"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached 在一个仓库之外"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: 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/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/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: 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/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "选项 '%s' 和 '%s' 不能同时使用"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' 在仓库之外"
#: apply.c:800
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3593
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "仓库缺乏执行三方合并所必需的数据对象。"
-#: apply.c:3596
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "执行三方合并...\n"
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3628
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "无法执行三方合并...\n"
-#: apply.c:3642
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3647
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3664
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "回落到直接应用...\n"
-#: apply.c:3676
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3749
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3751
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3978
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3998
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:4023
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:4027
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4042
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4134
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4141
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4144
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4153
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4163
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4301
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4335
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4341
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4349
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
-msgstr "写入 '%s' 失败"
+msgstr "无法写入 '%s'"
-#: apply.c:4402
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4472
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4570
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4578
+#: apply.c:4580
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4581
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4592
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4614
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4618
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4747
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "未能识别的输入"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
-#: apply.c:4775
+#: apply.c:4779
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4932
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4959
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4973
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:5017
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:5020
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "数字"
-#: apply.c:5023
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:5026
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:5028
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:5032
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:5034
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:5036
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:5038
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:5040
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:5042
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:5044
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:5047
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:5049
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
-#: apply.c:5051
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5056
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
#: builtin/rebase.c:1051
msgid "action"
msgstr "动作"
-#: apply.c:5058
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5067
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5069
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5071
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5073
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "冗长输出"
-
-#: apply.c:5076
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5079
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "根目录"
-#: apply.c:5082
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "对空的补丁不返回错误"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支持的文件模式：0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "无法启动 '%s' 过滤器"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "无法重定向描述符"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 过滤器报告了错误"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "不能读取 %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
msgid "archive format"
msgstr "归档格式"
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "前缀"
#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "文件"
msgstr "列出支持的归档格式"
#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "仓库"
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
#: builtin/notes.c:496
msgid "command"
msgstr "命令"
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "选项 --exec 只能和 --remote 同时使用"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "选项 '%s' 需要 '%s'"
#: archive.c:582
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "选项 --add-file 和 --remote 不能同时使用"
-
#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-#: branch.c:53
-#, c-format
+#: branch.c:77
msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"
-"\"git branch --set-upstream-to=%s%s%s\" 。"
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未设置分支 %s 作为它自己的上游。"
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
-#: branch.c:93
+#: branch.c:88
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
+msgid "not setting branch '%s' as its own upstream"
+msgstr "没有将分支 '%s' 设置为它自己的上游"
-#: branch.c:94
+#: branch.c:144
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
-#: branch.c:98
+#: branch.c:145
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
+msgid "branch '%s' set up to track '%s'."
+msgstr "分支 '%s' 设置为跟踪 '%s'。"
-#: branch.c:99
+#: branch.c:148
#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
+msgid "branch '%s' set up to track:"
+msgstr "分支 '%s' 设置为跟踪："
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "无法写入上游分支配置"
-#: branch.c:105
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："
-#: branch.c:109
+#: branch.c:203
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"
-#: branch.c:110
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "无法写入上游分支配置"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"
-#: branch.c:156
+#: branch.c:252
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "not tracking: ambiguous information for ref %s"
msgstr "未跟踪：引用 %s 有歧义"
-#: branch.c:189
+#: branch.c:287
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' 不是一个有效的分支名称。"
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' 不是一个有效的分支名称"
-#: branch.c:208
+#: branch.c:307
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "ä¸\80个å\88\86æ\94¯å\90\8d '%s' å·²ç»\8få\98å\9c¨ã\80\82"
+msgid "a branch named '%s' already exists"
+msgstr "ä¸\80个å\90\8d为 '%s' ç\9a\84å\88\86æ\94¯å·²ç»\8få\98å\9c¨"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "无法强制更新当前分支。"
+#: branch.c:313
+#, c-format
+msgid "cannot force update the branch '%s'checked out at '%s'"
+msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
-#: branch.c:233
+#: branch.c:336
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "不是一个有效的对象名：'%s'。"
+msgid "not a valid object name: '%s'"
+msgstr "不是一个有效的对象名：'%s'"
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧义的对象名：'%s'。"
+msgid "ambiguous object name: '%s'"
+msgstr "歧义的对象名：'%s'"
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "无效的分支点：'%s'。"
+msgid "not a valid branch point: '%s'"
+msgstr "无效的分支点：'%s'"
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "不能写入，归档包版本 %d 不支持算法 %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "最终块有非零 ID %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
msgid "unable to find all commit-graph files"
msgstr "无法找到所有提交图形文件"
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "无效的提交位置。提交图形可能已损坏"
-#: commit-graph.c:767
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:800
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr "提交图需要溢出世代数据，但是没有"
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:1398
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:1415
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:1435
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:1454
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr "正在计算提交图拓扑级别"
-#: commit-graph.c:1507
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:1588
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr "计算提交变更路径的布隆过滤器"
-#: commit-graph.c:1665
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr "正在收集引用的提交"
-#: commit-graph.c:1690
+#: commit-graph.c:1693
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 个包中查找提交图的提交"
msgstr[1] "正在 %d 个包中查找提交图的提交"
-#: commit-graph.c:1703
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:1707
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:1744
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1762
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1811
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1855
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr "无法创建临时图层"
-#: commit-graph.c:1860
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "无法为 '%s' 调整共享权限"
-#: commit-graph.c:1917
+#: commit-graph.c:1920
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步写出提交图"
msgstr[1] "正在用 %d 步写出提交图"
-#: commit-graph.c:1953
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
-#: commit-graph.c:1969
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
-#: commit-graph.c:1989
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
-#: commit-graph.c:2122
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
-#: commit-graph.c:2166
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
-#: commit-graph.c:2274
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
-#: commit-graph.c:2381
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
-#: commit-graph.c:2479
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:2489
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:2506
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:2524
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:2539
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:2546
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:2556
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:2565
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:2579
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:2584
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-#: commit-graph.c:2588
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-#: commit-graph.c:2605
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2611
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1239
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1243
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1246
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1249
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1503
+#: commit.c:1505
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1581
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1607
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1608
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1792
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1795
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1813
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1858
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
-msgstr "解析 %s 失败"
+msgstr "无法解析 %s"
-#: config.c:1914
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2282
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2456
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2501
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2547
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2549
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2633
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2665
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2694
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
-msgstr "写入新的配置文件 %s 失败"
+msgstr "无法写入新的配置文件 %s"
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2957
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:3019
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:3043
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "不能 mmap '%s'%s"
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:3172
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3264
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3431
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "正在检查连通性"
#: connected.c:151
msgid "failed to close rev-list's stdin"
-msgstr "å\85³é\97 rev-list ç\9a\84æ \87å\87\86è¾\93å\85¥å¤±è´¥"
+msgstr "æ\97 æ³\95å\85³é\97 rev-list ç\9a\84æ \87å\87\86è¾\93å\85¥"
#: convert.c:183
#, c-format
msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
# 译者：注意保持前导空格
-#: diff.c:157
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:162
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:298
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
"'plain'"
-#: diff.c:326
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-#: diff.c:334
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
-#: diff.c:411
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:471
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4290
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G、-S 和 --find-object 是互斥的"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr "--pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
-#: diff.c:4730
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4778
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
-#: diff.c:4815
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4900
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4924
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4938
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:5006
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:5027
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:5046
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:5086
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5246
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "选项 -I 的正则表达式无效：'%s'"
-#: diff.c:5295
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5351
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5387
+#: diff.c:5338
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "<n>"
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5403
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5406
+#: diff.c:5357
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5410
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5414
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5417
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5420
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5424
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5428
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5432
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5435
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5438
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5441
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5443
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5444
+#: diff.c:5395
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5447
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5450
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5453
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5455
+#: diff.c:5406
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5456
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5459
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5462
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5465
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5467
+#: diff.c:5418
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5468
+#: diff.c:5419
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5469
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5472
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5476
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5479
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5482
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5485
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5488
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5493
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5498
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5503
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5506
+#: diff.c:5457
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5507
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5508
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5512
+#: diff.c:5463
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5516
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5519
+#: diff.c:5470
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5523
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5525
+#: diff.c:5476
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5528
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5530
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5533
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5535
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5537
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5540
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5543
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5546
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5549
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5552
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "<正则>"
-#: diff.c:5555
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "忽略所有行都和正则表达式匹配的变更"
-#: diff.c:5558
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
-#: diff.c:5561
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
-#: diff.c:5565
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
-#: diff.c:5567
+#: diff.c:5518
msgid "<algorithm>"
msgstr "<算法>"
-#: diff.c:5568
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
-#: diff.c:5570
+#: diff.c:5521
msgid "<text>"
msgstr "<文本>"
-#: diff.c:5571
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5574
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: diff.c:5577
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5580
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5583
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5586
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5589
+#: diff.c:5540
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5591
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5595
+#: diff.c:5546
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5597
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5599
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5601
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5603
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5605
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5607
+#: diff.c:5558
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5608
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5611
+#: diff.c:5562
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5612
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5616
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5619
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5621
+#: diff.c:5572
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5622
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5625
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5628
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5631
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5634
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "<路径>"
-#: diff.c:5636
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "先显示指定路径的变更"
-#: diff.c:5639
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "跳过指定路径的输出"
-#: diff.c:5641
+#: diff.c:5592
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5642
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5644
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5645
+#: diff.c:5596
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5647
+#: diff.c:5598
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5648
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
-#: diff.c:6306
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "由于文件太多，跳过详尽的重命名检查。"
-#: diff.c:6309
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
-#: diff.c:6312
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
-msgstr "读取排序文件 '%s' 失败"
+msgstr "无法读取排序文件 '%s'"
#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
-msgstr "禁止 cone 模式匹配"
+msgstr "停用锥形模式匹配"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:2464
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2766
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2890
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3158
+#: dir.c:3112
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: dir.c:3837
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3918
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: editor.c:77
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示：等待您的编辑器关闭文件...%c"
-#: entry.c:177
+#: entry.c:179
msgid "Filtering content"
msgstr "过滤内容"
-#: entry.c:498
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
-#: environment.c:143
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
-#: fetch-pack.c:193
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-#: fetch-pack.c:207
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:227
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:238
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "无法写到远程"
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需要 multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:467
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:498
+#: fetch-pack.c:499
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "完成"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:559
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:774
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:860
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:868
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:962
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:968
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack：无效的 index-pack 输出"
-#: fetch-pack.c:985
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:987
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "服务器不支持浅客户端"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "服务器不支持这个仓库的对象格式"
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "源仓库是浅克隆，拒绝克隆。"
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "不匹配的算法：客户端 %s，服务端 %s"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "服务器不支持算法 '%s'"
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "服务器不支持浅克隆请求"
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "服务器支持 filter"
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack：预期响应结束包"
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "来自远程的意外的 'ready'"
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
-#: gpg-interface.c:445
+#: gpg-interface.c:451
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
-#: gpg-interface.c:469
+#: gpg-interface.c:480
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
"（openssh 8.2p1+ 版本可用）"
-#: gpg-interface.c:523
+#: gpg-interface.c:536
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
-#: gpg-interface.c:576
+#: gpg-interface.c:624
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "坏的/不兼容的签名 '%s‘"
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "无法得到密钥 '%s' 的 ssh 指纹"
-#: gpg-interface.c:762
+#: gpg-interface.c:829
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
-#: gpg-interface.c:780
+#: gpg-interface.c:851
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
-#: gpg-interface.c:786
+#: gpg-interface.c:857
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
-#: gpg-interface.c:874
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
-msgstr "gpg æ\95°æ\8d®ç¾å\90\8d失败"
+msgstr "gpg æ\97 æ³\95为æ\95°æ\8d®ç¾å\90\8d"
-#: gpg-interface.c:895
+#: gpg-interface.c:967
msgid "user.signingkey needs to be set for ssh signing"
msgstr "ssh 签名需要设置 user.signingkey"
-#: gpg-interface.c:906
+#: gpg-interface.c:978
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "无法将 ssh 签名密钥写入 '%s'"
-#: gpg-interface.c:924
+#: gpg-interface.c:996
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "无法从 '%s' 读入 ssh 签名数据"
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:533
+#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
"功能"
-#: grep.c:1928
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
-msgstr "对 '%s' 调用 stat 失败"
+msgstr "无法对 '%s' 调用 stat"
-#: grep.c:1956
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
#: help.c:646
#, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "取而代之运行 '%s' ？ (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "取而代之运行 '%s' [y/N]？"
#: help.c:654
#, c-format
msgid "quoted CRLF detected"
msgstr "检测到被引用的 CRLF"
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "'%2$s' 的错误动作 '%1$s'"
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-ort.c:3856
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
"在树中被保留。"
-#: merge-ort.c:4152
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "无法收集树 %s、%s、%s 的合并信息"
"您对下列文件的本地修改将被合并操作覆盖：\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "已经是最新的。"
#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "创建路径 '%s'%s 失败"
+msgstr "无法创建路径 '%s'%s"
#: merge-recursive.c:892
#, c-format
#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
-msgstr "æ\89\93å¼\80 '%s' 失败：%s"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s'：%s"
#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
-msgstr "创建符号链接 '%s' 失败：%s"
+msgstr "无法创建符号链接 '%s'：%s"
#: merge-recursive.c:1002
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "不能写入索引。"
#: merge.c:41
msgid "failed to read the cache"
-msgstr "读取缓存失败"
+msgstr "无法读取缓存"
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "多包索引的对象ID扇出表大小错误"
-#: midx.c:109
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:125
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:130
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:135
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
-#: midx.c:152
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:154
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:156
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:158
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:174
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:221
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:271
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:502
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
-msgstr "æ·»å\8a å\8c\85æ\96\87件 '%s' 失败"
+msgstr "æ\97 æ³\95æ·»å\8a å\8c\85æ\96\87件 '%s'"
-#: midx.c:508
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
-msgstr "æ\89\93å¼\80å\8c\85ç´¢å¼\95 '%s' 失败"
+msgstr "æ\97 æ³\95æ\89\93å¼\80å\8c\85ç´¢å¼\95 '%s'"
-#: midx.c:576
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
-msgstr "在包文件中定位对象 %d 失败"
+msgstr "无法在包文件中定位对象 %d"
-#: midx.c:892
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "无法存储反向索引文件"
-#: midx.c:990
+#: midx.c:993
#, c-format
msgid "could not parse line: %s"
-msgstr "不能解析行： %s"
+msgstr "不能解析行：%s"
-#: midx.c:992
+#: midx.c:995
#, c-format
msgid "malformed line: %s"
msgstr "格式错误的行：%s"
-#: midx.c:1159
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略已存在的多包索引，校验码不匹配"
-#: midx.c:1184
+#: midx.c:1187
msgid "could not load pack"
msgstr "不能载入包"
-#: midx.c:1190
+#: midx.c:1193
#, c-format
msgid "could not open index for %s"
msgstr "不能打开 %s 的索引"
-#: midx.c:1201
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "添加包文件到多包索引"
-#: midx.c:1244
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "未知的首选包：'%s'"
-#: midx.c:1289
+#: midx.c:1292
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr "不能选择没有对象的首选包 %s"
-#: midx.c:1321
+#: midx.c:1324
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "没有看到要丢弃的包文件 %s"
-#: midx.c:1367
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "首选包 '%s' 已过期"
-#: midx.c:1380
+#: midx.c:1383
msgid "no pack files to index."
msgstr "没有要索引的包文件。"
-#: midx.c:1417
+#: midx.c:1420
msgid "could not write multi-pack bitmap"
msgstr "无法写入多包位图"
-#: midx.c:1427
+#: midx.c:1430
msgid "could not write multi-pack-index"
msgstr "无法写入多包索引"
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
-msgstr "删除 %s 失败"
+msgstr "无法删除 %s"
-#: midx.c:1517
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
-msgstr "æ¸\85ç\90\86ä½\8däº\8e %s ç\9a\84å¤\9aå\8c\85ç´¢å¼\95失败"
+msgstr "æ\97 æ³\95æ¸\85ç\90\86ä½\8däº\8e %s ç\9a\84å¤\9aå\8c\85ç´¢å¼\95"
-#: midx.c:1577
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "多包索引文件存在，但无法解析"
-#: midx.c:1585
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "不正确的校验码"
-#: midx.c:1588
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1603
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1608
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "midx 不包含 oid"
-#: midx.c:1617
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr "校验多包索引中的 OID 顺序"
-#: midx.c:1626
+#: midx.c:1634
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1646
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1653
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1669
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "为 oid[%d] = %s 加载包条目失败"
+msgstr "无法为 oid[%d] = %s 加载包条目"
-#: midx.c:1675
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
-msgstr "为包文件 %s 加载包索引失败"
+msgstr "无法为包文件 %s 加载包索引"
-#: midx.c:1684
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1709
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "正在对引用对象计数"
-#: midx.c:1719
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在查找和删除未引用的包文件"
-#: midx.c:1911
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
-#: midx.c:1931
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object-file.c:459
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: object-file.c:517
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径：%s"
-#: object-file.c:591
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略备用对象库，嵌套太深"
-#: object-file.c:598
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
-#: object-file.c:641
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
-#: object-file.c:659
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
-#: object-file.c:666
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
-#: object-file.c:701
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: object-file.c:722
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: object-file.c:728
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: object-file.c:734
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: object-file.c:742
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: object-file.c:773
+#: object-file.c:813
#, c-format
msgid "could not find object directory matching %s"
msgstr "无法找到和 %s 匹配的对象目录"
-#: object-file.c:823
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析备用引用时无效的行：%s"
-#: object-file.c:973
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: object-file.c:1008
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr "mmap 失败%s"
-#: object-file.c:1174
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: object-file.c:1417
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: object-file.c:1419
+#: object-file.c:1459
msgid "invalid object type"
msgstr "无效的对象类型"
-#: object-file.c:1430
+#: object-file.c:1470
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
-#: object-file.c:1434
+#: object-file.c:1474
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr "%s 的头部太长，超出了 %d 字节"
-#: object-file.c:1664
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
-msgstr "读取对象 %s 失败"
+msgstr "无法读取对象 %s"
-#: object-file.c:1668
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c:1672
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: object-file.c:1676
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: object-file.c:1781
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: object-file.c:1788
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: object-file.c:1795
+#: object-file.c:1835
msgid "file write error"
msgstr "文件写错误"
-#: object-file.c:1815
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: object-file.c:1882
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: object-file.c:1884
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: object-file.c:1908
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: object-file.c:1914
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: object-file.c:1918
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: object-file.c:1922
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: object-file.c:2011
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: object-file.c:2062
+#: object-file.c:2105
msgid "corrupt commit"
msgstr "损坏的提交"
-#: object-file.c:2070
+#: object-file.c:2113
msgid "corrupt tag"
msgstr "损坏的标签"
-#: object-file.c:2170
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: object-file.c:2173
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
-msgstr "%sï¼\9aæ\8f\92å\85¥æ\95°æ\8d®åº\93失败"
+msgstr "%sï¼\9aæ\97 æ³\95æ\8f\92å\85¥æ\95°æ\8d®åº\93"
-#: object-file.c:2262
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1448
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: object-file.c:2288
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: object-file.c:2315
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: object-file.c:2510
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配（预期 %s）"
-#: object-file.c:2533
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: object-file.c:2539
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: object-file.c:2544
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: object-file.c:2555
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
msgid "multi-pack bitmap is missing required reverse index"
msgstr "多包位图缺少必需的反向索引"
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
msgid "load_reverse_index: could not open pack"
msgstr "load_reverse_index：无法打开包"
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "无法得到 %s 的大小"
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "无法得到 %s 的磁盘使用量"
msgid "could not write '%s' promisor file"
msgstr "无法写入 '%s' 承诺者文件"
-#: packfile.c:626
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:656
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "包文件 %s 不能被映射%s"
-#: packfile.c:1923
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1927
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "选项 `%s' 期望一个数字值"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "格式错误的到期时间：'%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "格式错误的对象名 '%s'"
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
+
#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "您的意思是 `--%s`（有两个短线）？"
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "--%s 的别名"
-#: parse-options.c:891
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "未知选项 `%s'"
-#: parse-options.c:893
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
-#: parse-options.c:895
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-#: parse-options.c:919
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:933
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:948
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " 或：%s"
#. translated) N_() usage string, which contained embedded
#. newlines before we split it up.
#.
-#: parse-options.c:969
+#: parse-options.c:970
#, c-format
msgid "%*s%s"
msgstr "%*s%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:992
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:1039
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-数字"
msgid "the remote end hung up unexpectedly"
msgstr "远端意外挂断了"
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "协议错误：错误的行长度字符串：%.4s"
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "协议错误：错误的行长度 %d"
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
#: range-diff.c:304
msgid "failed to generate diff"
-msgstr "生成 diff 失败"
-
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
+msgstr "无法生成 diff"
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr "不能在对象数据库中创建空的数据对象"
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s：只能添加常规文件、符号链接或 git 目录"
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 没有检出一个提交"
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr "无法索引文件 '%s'"
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr "无法在索引中添加 '%s'"
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr "无法对 %s 执行 stat"
-#: read-cache.c:1373
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
-#: read-cache.c:1588
+#: read-cache.c:1601
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1720
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1730
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1786
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
-#: read-cache.c:1789
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
-#: read-cache.c:1798
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
-#: read-cache.c:1832
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
-#: read-cache.c:1834
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
-#: read-cache.c:1871
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
-#: read-cache.c:1887
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1944
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
-#: read-cache.c:1947
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
-#: read-cache.c:1950
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: read-cache.c:2209
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程：%s"
-#: read-cache.c:2222
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程：%s"
-#: read-cache.c:2255
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr "%s：打开索引文件失败"
-#: read-cache.c:2259
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能对打开的索引执行 stat 操作"
-#: read-cache.c:2263
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引文件比预期的小"
-#: read-cache.c:2267
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s：无法映射索引文件%s"
-#: read-cache.c:2310
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程：%s"
-#: read-cache.c:2337
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程：%s"
-#: read-cache.c:2375
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
-#: read-cache.c:2434
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3108
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr "无法转换为稀疏索引"
-#: read-cache.c:3179
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3192
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:3204
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: read-cache.c:3233
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
-#: read-cache.c:3390
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暂存区 #0"
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
#: rebase.c:29
#, c-format
msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s： 'preserve' 被 'merges' 取代"
+msgstr "%s：'preserve' 被 'merges' 取代"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr "丢失"
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "未能识别的 %%(objectsize) 参数：%s"
-
#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "未能识别的 %%(subject) 参数：%s"
-
#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能识别的 %%(contents) 参数：%s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "未能识别的 %%(raw) 参数：%s"
-
#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
-
#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "未能识别的 %%(align) 参数：%s"
-
#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "未能识别的 %%(if) 参数：%s"
-
#: ref-filter.c:568
#, c-format
msgid "%%(rest) does not take arguments"
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-
#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:2623
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2726
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2731
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
msgid "invalid branch name: %s = %s"
msgstr "无效的分支名：%s = %s"
-#: refs.c:671
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:920
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: refs.c:927
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
-#: refs.c:992
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
-#: refs.c:1084
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: refs.c:1155
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:2062
+#: refs.c:2069
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:2142
+#: refs.c:2152
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2153
+#: refs.c:2163
msgid "ref updates aborted by hook"
msgstr "引用更新被钩子中止"
-#: refs.c:2253 refs.c:2283
+#: refs.c:2271 refs.c:2301
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2259 refs.c:2294
+#: refs.c:2277 refs.c:2312
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1268
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1282 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1285 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
msgid "invalid refspec '%s'"
msgstr "无效的引用规格：'%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "配置的远程短名称不能以 '/' 开始：%s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "提供了一个以上的 receivepack，使用第一个"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "提供了一个以上的 uploadpack，使用第一个"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的键 '%s' 没有 '*'"
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 没有 '*'"
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用规格 %s 没有匹配"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用规格 %s 匹配超过一个"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"\n"
"都不行，所以我们已放弃。您必须给出完整的引用。"
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
"'%s:refs/heads/%s' 推送么？"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 无法被解析为分支"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "无法删除 '%s'：远程引用不存在"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目标引用规格 %s 匹配超过一个"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 查看详情）\n"
-#: remote.c:2137
+#: remote.c:2254
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
msgid "there were errors while writing '%s' (%s)"
msgstr "写入 '%s' (%s) 时出错"
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
-msgstr "刷新 '%s' 失败"
+msgstr "无法刷新 '%s'"
#: rerere.c:487 rerere.c:1023
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr "æ\9b´æ\96° '%s' ä¸ç\9a\84å\86²çª\81ç\8a¶æ\80\81失败"
+msgstr "æ\97 æ³\95æ\9b´æ\96° '%s' ä¸ç\9a\84å\86²çª\81ç\8a¶æ\80\81"
#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树"
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input 和 --no-walk 不兼容"
-
-#: revision.c:2346
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr "不再支持 --unpacked=<packfile>"
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk 和 --unsorted-input 不兼容"
-
-#: revision.c:2690
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2693
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2895
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-#: run-command.c:1278
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程：%s"
#: send-pack.c:378
msgid "failed to sign the push certificate"
-msgstr "为推送证书签名失败"
+msgstr "无法为推送证书签名"
#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。"
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
+
#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgid "%s: fast-forward"
msgstr "%s：快进"
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1229
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1235
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1248
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1290
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1292
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1338
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1340
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1344
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1365
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1367
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr "无效的作者身份 '%s'"
-#: sequencer.c:1508
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr "损坏的作者：缺失日期信息"
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
-msgstr "写提交对象失败"
+msgstr "无法写提交对象"
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1623
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1628
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1753
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1754
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1755
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr "第一个提交说明将被跳过："
-#: sequencer.c:1756
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1757
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1951
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1955
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1979
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:2089
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:2096
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:2115
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:2137
+#: sequencer.c:2139
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:2222
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:2282
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:2283
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2304
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
-#: sequencer.c:2362
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2370
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2450
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2459
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2502
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:2563
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2574
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:2660
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2669
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2709
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2711
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2716
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2727
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2729
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2807
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2916
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2936
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:3048
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:3050
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3053
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:3055
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3069
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:3084
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:3180
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:3181
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:3187
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:3198
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:3239
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:3248
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:3258
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:3265
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:3268
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
"您已经提交了么？\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3447
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3455
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3465
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3472
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:3502
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr "正在执行：%s\n"
-#: sequencer.c:3517
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3523
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3529
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3591
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3664
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3669
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3748
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3780
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3802
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3811
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3823
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3878
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:4024
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:4040
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:4121
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr "无法自动贮藏"
-#: sequencer.c:4124
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的贮藏响应：'%s'"
-#: sequencer.c:4130
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: sequencer.c:4133
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了自动贮藏：%s\n"
-#: sequencer.c:4137
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr "无法硬性重置（reset --hard）"
-#: sequencer.c:4162
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用自动贮藏。\n"
-#: sequencer.c:4174
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:4177
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
"您的修改在贮藏区中很安全。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:4182
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr "应用自动贮藏导致冲突。"
-#: sequencer.c:4183
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
-#: sequencer.c:4255
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:4270
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:4272
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4304
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4350
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在变基（%d/%d）%s"
-#: sequencer.c:4396
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4466
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:4514
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4519
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4533
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4593
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功变基并更新 %s。\n"
-#: sequencer.c:4645
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4654
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4656
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4658
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4661
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4752
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4762
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4882
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4886
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4921
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
#, c-format
msgid "skipped previously applied commit %s"
msgstr "跳过了先前已应用的提交 %s"
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
-#: sequencer.c:5408
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:5411
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5705
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5805
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位于 '%s' 的仓库之外"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"%s：工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "发现未知的仓库扩展："
msgstr[1] "发现未知的仓库扩展："
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr "打开 '%s' 出错"
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大，无法作为 .git 文件：'%s'"
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式：%s"
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径：%s"
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr "不是 git 仓库：%s"
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是 git 仓库：'%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
-msgstr "获取 '%*s%s%s' 状态（stat）失败"
+msgstr "无法获取 '%*s%s%s' 状态（stat）"
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是 git 仓库（或者任何父目录）：%s"
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1443
+#: setup.c:1508
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1448
+#: setup.c:1513
msgid "setsid failed"
msgstr "setsid 失败"
-#: sparse-index.c:273
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: strbuf.c:1183
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr "不能编辑 '%s'"
msgid "process for submodule '%s' failed"
msgstr "处理子模组 '%s' 失败"
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1474
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1344
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交或贮藏您的修改。"
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒绝删除当前工作目录：\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
"尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
"尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "正在终止\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "正在更新文件"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
"并且碰撞组中只有一个文件存在工作区中：\n"
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr "正在更新索引标志"
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "工作树和未跟踪提交具有重复条目：%s"
-#: upload-pack.c:1561
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "在 fetch 参数之后应该有一个 flush 包"
msgid "Fetching objects"
msgstr "正在获取对象"
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
-msgstr "读取 '%s' 失败"
+msgstr "无法读取 '%s'"
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件，错误码 %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "不是一个目录"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr ".git 不是一个文件"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr ".git 文件损坏"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr ".git 文件不正确"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "不是一个有效的路径"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "无法定位仓库，.git 不是一个文件"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "无法定位仓库，.git 文件没有指向一个仓库"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "无法定位仓库，.git 文件损坏"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "gitdir 不可读"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "gitdir 不正确"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "不是一个有效的目录"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "gitdir 文件不存在"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "无法读取 gitdir 文件（%s）"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "无效的 gitdir 文件"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "gitdir 文件指向一个不存在的位置"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:958
+#: wt-status.c:964
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的贮藏区当前有 %d 条记录"
msgstr[1] "您的贮藏区当前有 %d 条记录"
-#: wt-status.c:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"不要改动或删除上面的一行。\n"
"其下所有内容都将被忽略。"
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
"为避免，您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr " （使用 \"git am --allow-empty\" 将这个补丁记录为空提交）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1365
+#: wt-status.c:1377
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
msgstr[1] "最后的命令已完成（%d 条命令被执行）："
-#: wt-status.c:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1384
+#: wt-status.c:1396
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "拣选操作正在进行中。"
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "还原操作正在行中。"
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " （执行 \"git revert --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " （使用 \"git revert --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "您处于一个稀疏检出中。"
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件"
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "不同"
# 译者：注意保持句尾空格
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "落后 "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "无法发送 IPC 命令"
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "无法读取 IPC 响应"
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "无法启动 accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "无法启动 '%s' 的 worker[0]"
#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
-msgstr "删除 '%s' 失败"
+msgstr "无法删除 '%s'"
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:330
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:333
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:336
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:338
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:343
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:351
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:374
-msgid "interactive picking"
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "冗长输出"
+
+#: builtin/add.c:371
+msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:376
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:377
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:378
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:379
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
-#: builtin/add.c:380
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:381
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:384
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:386
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:387
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:388
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
-msgstr "允许更新稀疏检出 cone 以外的条目"
+msgstr "允许更新稀疏检出锥以外的条目"
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:393
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:395
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "`git stash -p` 的后端"
-#: builtin/add.c:413
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:442
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:462
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"运行下面的命令来关闭本消息\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:477
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 与 --interactive/--patch 不兼容"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 与 --edit 不兼容"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 与路径表达式参数不兼容"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' 和路径规格参数不能同时使用"
-#: builtin/add.c:583
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:585
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"运行下面的命令来关闭本消息\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "--empty 的值无效：%s"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:456
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:498
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:536
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:562
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:750
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:815
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:863
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:875
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:968
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
-msgstr "创建目录 '%s' 失败"
+msgstr "无法创建目录 '%s'"
-#: builtin/am.c:978
+#: builtin/am.c:1004
msgid "Failed to split patches."
-msgstr "æ\8b\86å\88\86è¡¥ä¸\81失败。"
+msgstr "æ\97 æ³\95æ\8b\86å\88\86è¡¥ä¸\81。"
-#: builtin/am.c:1127
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1128
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。"
+
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1224
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "补丁为空。"
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺失作者行"
-#: builtin/am.c:1320
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1539
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1541
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1560
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1566
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1592
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1624
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1698
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "提交内容为："
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1758
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "跳过：%.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "创建空提交：%.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "补丁为空。"
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1815
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1821
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1825
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "没有变更 —— 记录为空提交。"
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
-msgstr "æ¸\85空索å¼\95失败"
+msgstr "æ\97 æ³\95æ¸\85空索å¼\95"
-#: builtin/am.c:2079
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2187
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2229
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "无效的 --show-current-patch 值：%s"
-#: builtin/am.c:2233
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
-#: builtin/am.c:2264
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2265
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2271
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2273
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2275
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2278
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "在提交说明中添加 Signed-off-by 尾注"
-#: builtin/am.c:2281
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2283
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2287
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2289
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2292
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2295
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2297
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "传递给 git-mailinfo"
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
msgid "n"
msgstr "n"
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2324
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2330
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2332
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2335
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2338
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2341
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr "恢复原始分支并终止打补丁操作"
-#: builtin/am.c:2344
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr "终止补丁操作但保持 HEAD 不变"
-#: builtin/am.c:2348
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "显示正在应用的补丁"
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "把空补丁记录为空提交"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2355
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "如何处理空补丁"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2379
+#: builtin/am.c:2441
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2386
+#: builtin/am.c:2448
msgid "failed to read the index"
-msgstr "读取索引失败"
+msgstr "无法读取索引"
-#: builtin/am.c:2401
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2425
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2431
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: builtin/am.c:2441
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
msgid "show work cost statistics"
msgstr "显示工作消耗统计"
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "强制显示进度报告"
msgid "ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "版本"
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "追踪代码行"
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "更新配置文件失败"
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
-#: builtin/branch.c:472
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:478
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:493
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:497
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:514
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
-#: builtin/branch.c:516
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:527
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:556
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:558
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:562
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:565
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:571
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:580
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:582
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:598
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:632
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:634
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:635
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "设置跟踪模式（参见 git-pull(1)）"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "设置分支跟踪配置"
-#: builtin/branch.c:638
+#: builtin/branch.c:645
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:640
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:641
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:642
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:643
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:651
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:652
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:655
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:656
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:657
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:658
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:659
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:660
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:661
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "显示当前分支名"
-#: builtin/branch.c:662
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:664
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:665
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:666
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:667
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:668
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
#: builtin/tag.c:475
msgid "object"
msgstr "对象"
-#: builtin/branch.c:671
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose 不兼容"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:768
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:773
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:780
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:783
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:798
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:807
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:812
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:816
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:823
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:836
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:840
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:846
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:856
+#: builtin/branch.c:862
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:860
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "不显示进度报告"
msgstr "git checkout--worker [<选项>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr "字符串"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新创建了 %d 个合并冲突"
msgstr[1] "重新创建了 %d 个合并冲突"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "从 %2$s 更新了 %1$d 个路径"
msgstr[1] "从 %2$s 更新了 %1$d 个路径"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "从索引区更新了 %d 个路径"
msgstr[1] "从索引区更新了 %d 个路径"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' 不能和 %s 同时使用"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都没有指定"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
"名称，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "只期望一个引用"
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支，得到标签 '%s'"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支，得到远程分支 '%s'"
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支，得到 '%s'"
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支，得到提交 '%s'"
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "冲突输出风格（merge 或 diff3）"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "冲突输出风格（merge、diff3 或 zdiff3）"
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "为新的分支设置上游信息"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c、-%c 和 --orphan 是互斥的"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用"
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p 和 --overlay 互斥"
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名，尝试 -%c"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 与 --detach 不兼容"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 与 --patch 不兼容"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'（默认）"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "使用叠加模式（默认）"
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "恢复工作区（默认）"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "使用叠加模式"
msgid "could not lstat %s\n"
msgstr "不能对 %s 调用 lstat\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "拒绝删除当前工作目录\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "将拒绝删除当前工作目录\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "强制"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "名称"
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
#: builtin/pull.c:212
msgid "depth"
msgstr "深度"
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
#: builtin/pull.c:215
msgid "time"
msgstr "时间"
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
-msgstr "创建链接 '%s' 失败"
+msgstr "无法创建链接 '%s'"
#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "æ\8b·è´\9dæ\96\87件è\87³ '%s' 失败"
+msgstr "æ\97 æ³\95æ\8b·è´\9dæ\96\87件è\87³ '%s'"
#: builtin/clone.c:362
#, c-format
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项不兼容。"
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 选项不兼容。"
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2047
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr "目录"
msgid "Collecting commits from input"
msgstr "正从标准输入收集提交"
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "未识别的子命令：%s"
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
#: builtin/tag.c:454
msgid "message"
msgstr "说明"
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "提交说明"
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
-msgstr "git commit-tree：读取失败"
+msgstr "git commit-tree：无法读取"
#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
-msgstr "解包 HEAD 树对象失败"
-
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a 在一起没有意义"
+msgstr "无法解包 HEAD 树对象"
#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "不能将 -m 和 --fixup 组合使用：%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "选项 '%s' 和 '%s:%s' 不能同时使用"
#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr "无效的未追踪文件参数 '%s'"
-
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项不兼容"
+msgstr "无效的未跟踪文件参数 '%s'"
#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用"
#: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用"
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "您正处于一个变基过程中 -- 无法修补提交。"
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "未知选项：--fixup=%s:%s"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名，可以设置索引相似度"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]提交"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾注"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
msgstr "添加自定义尾注"
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "添加 Signed-off-by 尾注"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "强制编辑提交"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "因提交说明的正文为空而终止提交。\n"
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
-msgstr "æ ¼å¼\8få\8c\96é»\98认é\85\8dç½®å\80¼å¤±è´¥：%s"
+msgstr "æ\97 æ³\95æ ¼å¼\8få\8c\96é»\98认é\85\8dç½®å\80¼：%s"
#: builtin/config.c:441
#, c-format
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 与 --abbrev=0 不兼容"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 与提交号不兼容"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken 与提交号不兼容"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin 和 --merge-base 是互斥的"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "选项 '%s' 和提交号不能同时使用"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
msgid "%s...%s: no merge base"
msgstr "%s...%s：无合并基线"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "不是 git 仓库"
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s：多条合并基线，使用 %s"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
msgid ""
"combined diff formats ('-c' and '--cc') are not supported in\n"
"directory diff mode ('-d' and '--dir-diff')."
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
#, c-format
msgid "failed: %d"
msgstr "失败：%d"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "传递给 `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index 不兼容"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui、--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map 取值不能为空"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "如果文件存在，从该文件导入标记"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "当标签缺少标记人字段时，假装提供一个"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "from:to"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "在匿名输出中将 <from> 转换为 <to>"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "对带有标记 ID 的标签做标记"
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map 而没有 --anonymize 没有意义"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "子模组 '%s' 缺少 from 标记"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "子模组 '%s' 缺少 to 标记"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "预期 'mark' 命令，得到 %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "预期 'to' 命令，得到 %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr "子模组重写选项的预期格式为 name:filename"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
msgid "Lockfile created but not reported: %s"
msgstr "Lockfile 已创建但未报告：%s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能为负数"
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "为 git pull/fetch 设置上游"
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr "使用原子事务更新引用"
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "将获取到的引用写入 FETCH_HEAD 文件"
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr "不获取包文件；而是打印协商的祖先提交"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "获取后执行 'maintenance --auto'"
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "抓取后写提交图"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "从标准输入获取引用规格"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:587
+msgid "couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:761
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
msgid "[rejected]"
msgstr "[已拒绝]"
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:890
+#: builtin/fetch.c:881
+msgid "checked out in another worktree"
+msgstr "已在另一个工作树中检出"
+
+#: builtin/fetch.c:891
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
+#: builtin/fetch.c:963
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:895
+#: builtin/fetch.c:896
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:918
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:921
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:924
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:962
+#: builtin/fetch.c:963
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:967
+#: builtin/fetch.c:968
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1071
msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用。\n"
+"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用；\n"
"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
-"'git config fetch.showForcedUpdates true'。"
+"'git config fetch.showForcedUpdates true'"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1075
#, c-format
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"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
-"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
+"花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n"
+"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1107
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1136
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1226 builtin/fetch.c:1374
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1247
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1344
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1345
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1377
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1378 builtin/remote.c:1128
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1400
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒绝获取到非纯仓库的当前分支 %s"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1420
#, 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 是无效的"
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1423
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1450
#, c-format
msgid "the object %s does not exist"
msgstr "对象 '%s' 不存在"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1638
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支，和 --set-upstream 不兼容"
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1650
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
+
+#: builtin/fetch.c:1663
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "没有为一个远程跟踪分支设置上游"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1665
msgid "not setting upstream for a remote tag"
msgstr "没有为一个远程标签设置上游"
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1667
msgid "unknown branch type"
msgstr "未知的分支类型"
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1669
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"未发现源分支。\n"
-"您需要使用 --set-upstream 选项指定一个分支。"
+"未发现源分支；\n"
+"您需要使用 --set-upstream 选项指定一个分支"
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1799 builtin/fetch.c:1862
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1809 builtin/fetch.c:1864
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1821
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "无法获取 '%s'（退出码：%d）\n"
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1925
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或远程仓库名"
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "您需要指定一个标签名称。"
+#: builtin/fetch.c:1961
+msgid "you need to specify a tag name"
+msgstr "您需要指定一个标签名称"
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2027
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
+#: builtin/fetch.c:2031
+msgid "negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow 不能同时使用"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2040
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2059
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2068
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2076
+msgid "fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2092
msgid "must supply remote when using --negotiate-only"
msgstr "在使用 --negotiate-only 时必须提供远程仓库"
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "协议不支持 --negotiate-only，退出。"
-
#: builtin/fetch.c:2097
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "协议不支持 --negotiate-only，退出"
+
+#: builtin/fetch.c:2116
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2120
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2124
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "使用 <名称> 而不是真正的目标分支"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "从文件中读取"
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "引用占位符适用于 shells"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "引用占位符适用于 perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "引用占位符适用于 python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "引用占位符适用于 Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "只打印已经合并的引用"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "只打印没有合并的引用"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
#: builtin/fsck.c:621
#, c-format
msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s： 哈希路径不匹配，在 %s 被找到"
+msgstr "%s：哈希路径不匹配，发现于 %s"
#: builtin/fsck.c:624
#, c-format
#: builtin/fsck.c:628
#, c-format
msgid "%s: object is of unknown type '%s': %s"
-msgstr "%s： 对象有未知的类型 '%s': %s"
+msgstr "%s：对象有未知的类型 '%s': %s"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析对象：%s"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "坏的 sha1 文件：%s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的东西（%s）"
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分离头指针的指向不存在"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "正在检查缓存树"
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中无效的 sha1 指针"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非树对象"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "显示悬空的对象"
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "将悬空对象写入 .git/lost-found 中"
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在检查对象"
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s：对象缺失"
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数：期望 sha1，得到 '%s'"
msgid "failed to parse '%s' value '%s'"
msgstr "无法解析 '%s' 值 '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "不能读取 '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，对所有其它包文件重新打包"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr "解析 gc.logexpiry 的值 %s 失败"
+msgstr "无法解析 gc.logexpiry 的值 %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr "解析清除期限值 %s 失败"
+msgstr "无法解析清除期限值 %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule 不被允许"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "无法识别的 --schedule 参数 '%s'"
-#: builtin/gc.c:868
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "无法写入提交图"
-#: builtin/gc.c:904
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "无法预先获取远程仓库"
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
msgstr "无法启动 'git pack-objects' 进程"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
msgstr "无法完成 'git pack-objects' 进程"
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "无法写入多包索引"
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' 失败"
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' 失败"
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "锁文件 '%s' 已存在，跳过维护"
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "任务 '%s' 失败"
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' 不是一个有效的任务"
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "任务 '%s' 不能被多次选择"
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "基于仓库状态来运行任务"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "频率"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "基于频率运行任务"
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "不通过标准错误报告进度或其它信息"
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
msgid "task"
msgstr "任务"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "运行一个特定的任务"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "无法运行 'git config'"
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "无法扩展路径 '%s'"
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "无法启动 launchctl"
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "无法为 '%s' 创建目录"
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "无法引导服务 %s"
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "无法创建临时 XML 文件"
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "无法启动计划任务"
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "无法打开 'crontab' 的标准输入"
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' 终止"
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
msgid "failed to start systemctl"
msgstr "无法启动 systemctl"
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
msgid "failed to run systemctl"
msgstr "无法运行 systemctl"
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
#, c-format
msgid "failed to delete '%s'"
-msgstr "删除 '%s' 失败"
+msgstr "无法删除 '%s'"
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
#, c-format
msgid "unrecognized --scheduler argument '%s'"
msgstr "无法识别的 --scheduler 参数 '%s'"
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
msgid "neither systemd timers nor crontab are available"
msgstr "systemd 和 crontab 的定时器都不可用"
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
#, c-format
msgid "%s scheduler is not available"
msgstr "%s 调度器不可用"
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "另外一个进程正运行于后台维护"
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
msgid "git maintenance start [--scheduler=<scheduler>]"
msgstr "git maintenance start [--scheduler=<调度器>]"
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
msgid "scheduler"
msgstr "调度器"
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
msgid "scheduler to trigger git maintenance run"
msgstr "触发 git maintenance 执行的调度器"
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "无法将仓库添加到全局配置"
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <子命令> [<选项>]"
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "无效子命令：%s"
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:223
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:236
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:244
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
-msgstr "æ\89§è¡\8c '%s' 失败"
+msgstr "æ\97 æ³\95æ\89§è¡\8c '%s'"
-#: builtin/help.c:340
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:352
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:467
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:483
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:490
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "坏的 alias.%s 字符串：%s"
-#: builtin/help.c:581
+#: builtin/help.c:580
msgid "this option doesn't take any other arguments"
msgstr "这个选项不带其他参数"
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:624
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "'git help config' 获取更多信息"
#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
-msgstr "应用 delta 失败"
+msgstr "无法应用 delta"
#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgid "unknown hash algorithm '%s'"
msgstr "未知的哈希算法 '%s'"
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin 不能和 --stdin 同时使用"
-
#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin 需要 git 仓库"
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format 不能和 --stdin 同时使用"
-
#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
msgid "specify the hash algorithm to use"
msgstr "指定要使用的哈希算法"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 是互斥的"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<范围>:<文件> 不能和路径表达式共用"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s：从描述生成附函的模式无效"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "只需要一个范围"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "不是一个范围"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "无法将 '%s' 解析为一个有效引用"
-#: builtin/log.c:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr "无法推断当前系列的 range-diff 起始"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "使用 '%s' 作为当前系列的 range-diff 源"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr "重制-计数"
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "输出文件名的最大长度"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "从分支描述获取附函的模式"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基于一个分支描述生成部分附函"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "header"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <版本> 的差异"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout、--output 和 --output-directory 是互斥的"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需要 --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
msgid "separate paths with the NUL character"
msgstr "用 NUL 字符分隔路径"
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小写字母表示 'fsmonitor clean' 文件"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "跳过和模式匹配的文件"
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
msgid "read exclude patterns from <file>"
msgstr "从 <文件> 读取排除模式"
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "树对象"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "显示调试数据"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "抑制重复条目"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "在稀疏索引存在时显示稀疏目录"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
msgstr "使用基于 diff3 的合并"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "使用基于狂热 diff3（zealous diff3）的合并"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "如果冲突，使用我们的版本"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "如果冲突，使用他们的版本"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "如果冲突，使用联合版本"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "如果冲突，使用指定长度的标记"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "不要警告冲突"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:124
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:147
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:201
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:206
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:272
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:284
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "使用 <名称> 而不是真正的目标"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
#
-#: builtin/merge.c:293
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort，但是保留索引和工作区"
-#: builtin/merge.c:295
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:304
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
-#: builtin/merge.c:321
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:326
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:331
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "读取树失败"
-#: builtin/merge.c:401
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "已经是最新的。（无可挤压）"
-#: builtin/merge.c:415
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "挤压提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:465
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:743
+#: builtin/merge.c:745
#, c-format
msgid "unknown strategy option: -X%s"
msgstr "未知的策略选项：-X%s"
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:814
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:823
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:829
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/merge.c:892
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:907
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:968
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "您不能将 --squash 和 --commit 组合使用。"
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "使用 %s 策略以准备手工解决。\n"
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
msgid "tag on stdin did not refer to a valid object"
msgstr "标准输入上的标签未指向一个有效的对象"
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr "无法写标签文件"
msgid "refs snapshot for selecting bitmap commits"
msgstr "用于选择位图提交的引用快照"
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr "只打印基于引用的名称（非对象名）"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
msgid "Write/edit the notes for the following object:"
msgstr "为下面的对象写/编辑说明："
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "不能为对象 '%s' 开始 'show'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "不能读取 'show' 的输出"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"
-#: builtin/notes.c:195
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"
-#: builtin/notes.c:204
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "不能写注解对象"
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
-msgstr "读取对象 '%s' 失败。"
+msgstr "无法读取对象 '%s'。"
#: builtin/notes.c:266
#, c-format
#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
+msgstr "无法把注解从 '%s' 拷贝到 '%s'"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr "太多参数"
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr "删除引用 NOTES_MERGE_REF 失败"
+msgstr "无法删除引用 NOTES_MERGE_REF"
#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
-msgstr "删除 'git notes merge' 工作区失败"
+msgstr "无法删除 'git notes merge' 工作区"
#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
-msgstr "解析 NOTES_MERGE_REF 失败"
+msgstr "无法解析 NOTES_MERGE_REF"
#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:871
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:874
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:876
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/notes.c:898
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:910
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:913
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:953
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
-msgstr "对 %s 调用 stat 失败"
+msgstr "无法对 %s 调用 stat"
#: builtin/pack-objects.c:1268
msgid "failed to write bitmap index"
-msgstr "写入位图索引失败"
+msgstr "无法写入位图索引"
#: builtin/pack-objects.c:1294
#, c-format
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-
#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
msgid "Enumerating objects"
msgstr "枚举对象中"
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍历 promisor 包以外的对象"
-#: builtin/prune.c:151
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
msgstr "<远程>"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "<分支>"
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:942
+#: builtin/pull.c:969
msgid ""
"You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
"您有偏离的分支，需要指定如何调和它们。您可以在执行下一次\n"
"pull 操作之前执行下面一条命令来抑制本消息：\n"
"\n"
-" git config pull.rebase false # 合并（缺省策略）\n"
+" git config pull.rebase false # 合并\n"
" git config pull.rebase true # 变基\n"
" git config pull.ff only # 仅快进\n"
"\n"
"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
"或者 --ff-only 参数覆盖缺省设置。\n"
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
msgid "Cannot fast-forward to multiple branches."
msgstr "无法快进到多个分支。"
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
msgid "Need to specify how to reconcile divergent branches."
msgstr "需要指定如何调和偏离的分支。"
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr "æ\8e¨é\80\81ä¸\80äº\9bå¼\95ç\94¨å\88° '%s' 失败"
+msgstr "æ\97 æ³\95æ\8e¨é\80\81ä¸\80äº\9bå¼\95ç\94¨å\88° '%s'"
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "仓库"
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
"\n"
" git push <名称>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags 不兼容"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags 不兼容"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror 不兼容"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "--preserve-merges 被 --rebase-merges 代替。"
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
-
#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
msgstr "--strategy 需要 --merge 或 --interactive"
#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "不能组合使用应用选项和合并选项"
+msgid "apply options and merge options cannot be used together"
+msgstr "应用选项和合并选项不能同时使用"
#: builtin/rebase.c:1476
#, c-format
msgstr "无此分支/提交 '%s'"
#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "您必须指定一个目录。"
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "您必须指定一个目录"
#: builtin/reflog.c:17
msgid ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists <引用>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "正在标记可达对象..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "未指定要删除的引用日志"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "不是一个引用日志：%s"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "没有 '%s' 的引用日志"
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "无效的引用格式：%s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
msgid "Updating %s"
msgstr "更新 %s 中"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "不能获取 %s"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "不能打开 %s 的索引"
-#: builtin/repack.c:371
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "包 %s 太大，不在几何级数中考虑"
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "包 %s 太大导致数字溢出"
-#: builtin/repack.c:496
+#: builtin/repack.c:498
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "无法打开临时文件 %s 进行写入"
-#: builtin/repack.c:514
+#: builtin/repack.c:516
msgid "could not close refs snapshot tempfile"
msgstr "不能关闭引用快照临时文件"
-#: builtin/repack.c:628
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:630
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:633
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:635
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:637
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:639
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:642
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:644
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:646
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:647
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:648
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:650
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:652
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:654
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:656
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:658
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:660
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:662
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:664
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:666
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "使用因子 <n> 查找几何级数"
-#: builtin/repack.c:668
+#: builtin/repack.c:670
msgid "write a multi-pack index of the resulting packs"
msgstr "写入结果包的多包索引"
-#: builtin/repack.c:678
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A 不兼容"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 和 -A、-a 不兼容"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
-#: builtin/repack.c:855
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "缺少需要的文件：%s"
-#: builtin/repack.c:857
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "不能删除：%s"
msgid "unable to open %s for reading"
msgstr "无法为读取打开 %s"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "无法启动 mktree"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "无法从 mktree 读取"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree 报告失败"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree 没有返回一个对象名"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "无法对 %s 执行 fstat"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "无法向数据库写入对象"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "不是一个有效的对象名：'%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "无法得到 %s 的对象类型"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "编辑对象文件失败"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "新对象和旧对象相同：'%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "无法将 %s 解析为一个提交"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式错误的合并标签"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一个 gpg 签名"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "对 '%s' 移植没有必要"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和旧的一样：'%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"不能转换下列移植：\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "转换现存的移植文件"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "使用此格式"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "不列出时不能使用 --format"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "只有写一个替换时 -f 才有意义"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意义"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d 需要至少一个参数"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "错误的参数个数"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e 需要且仅需要一个参数"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g 需要至少一个参数"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不带参数"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "只能为 -l 提供一个模式"
msgid "unable to generate diff for '%s'"
msgstr "无法为 '%s' 生成差异"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "混杂"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "软性"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "硬性"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "合并"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:89
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:91
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:97
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:122
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:201
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:303
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:304
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:310
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:316
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:350
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:358
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:379
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:394
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N 只能和 --mixed 同时使用"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:422
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
"重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
-#: builtin/reset.c:440
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:445
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
msgstr "rev-list 不支持显示注解"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "标记计数和 --objects 不兼容"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "标记计数和 '%s' 不能同时使用"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-
#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能处理 %d 个以上的版本。"
msgstr[1] "不能处理 %d 个以上的版本。"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "这个工作区不是稀疏的"
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）"
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"cone"
-msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出 cone 中"
+msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出锥中"
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
#, c-format
msgid "failed to remove directory '%s'"
msgstr "无法删除目录 '%s'"
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr "无法为稀疏检出文件创建目录"
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "无法升级仓库格式以启用 worktreeConfig"
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr "无法设置 extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "无法修改 sparse-index 配置"
+
+#: builtin/sparse-checkout.c:422
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
msgid "initialize the sparse-checkout in cone mode"
-msgstr "初始化稀疏检出为 cone 模式"
+msgstr "初始化稀疏检出为锥形模式"
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
msgid "toggle the use of a sparse index"
msgstr "切换稀疏索引的使用"
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "无法修改 sparse-index 配置"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr "无法规范化路径 %s"
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr "无法加载现存的稀疏检出模式"
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "已有的稀疏检出模式不使用锥形模式"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <模式>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
msgid "read patterns from standard in"
msgstr "从标准输入读取模式"
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "没有可以添加到的稀疏检出"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | <模式"
+">)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "必须在稀疏检出中重应用稀疏模式"
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr "刷新工作目录时出错"
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
-" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
" [--] [<路径规格>...]]"
#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<消息>]"
#: builtin/stash.c:55
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:575
+#: builtin/stash.c:576
msgid "could not restore untracked files from stash"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:651
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s（%s）"
-#: builtin/stash.c:654
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：无法丢弃贮藏条目"
-#: builtin/stash.c:667
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:717
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:740
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:824
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "无法解析树"
-#: builtin/stash.c:835
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "无法解包目录树"
-#: builtin/stash.c:855
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "在贮藏中包含未跟踪文件"
-#: builtin/stash.c:858
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "仅显示贮藏中的未跟踪文件"
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:973
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "没有暂存的修改"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "无法保存当前暂存状态"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "不能同时使用参数 --staged 和 --include-untracked 或 --all"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "只贮藏暂存的变更"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
-msgstr "递归子模组 '%s' 失败"
+msgstr "无法递归进入子模组 '%s'"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "抑制子模组状态输出"
msgid "could not fetch a revision for HEAD"
msgstr "不能为 HEAD 获取一个版本"
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 是互斥的"
-
#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
-"-rf' 命令）"
+"子模组工作区 '%s' 包含一个 .git 目录。这将会用 absorbgitdirs 子命令替换成一"
+"个 .git 文件。"
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区，即使包含本地修改"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
"'--reference' 来克隆。"
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
#, c-format
msgid "directory not empty: '%s'"
msgstr "目录非空：'%s'"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "不允许克隆到一个非空目录"
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组路径 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "子模组路径 '%s'：检出 '%s'\n"
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "子模组路径 '%s'：变基至 '%s'\n"
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "子模组路径 '%s'：合并入 '%s'\n"
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "子模组路径 '%s'：'%s %s'\n"
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr "无法在子模组路径 '%s' 中获取；尝试直接获取 %s："
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"of that commit failed."
msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。"
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
msgid "suppress output for update by rebase or merge"
msgstr "抑制变基或合并更新的输出"
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
msgid "force checkout updates"
msgstr "强制检出更新"
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
msgid "don't fetch new objects from the remote site"
msgstr "不要从远程地址获取新对象"
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
msgid "overrides update mode in case the repository is a fresh clone"
msgstr "当仓库是新的克隆时，覆盖更新模式"
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
msgid "depth for shallow fetch"
msgstr "浅获取的深度"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
msgid "sha1"
msgstr "sha1"
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
msgid "SHA1 expected by superproject"
msgstr "上层项目期待的 SHA1"
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
msgid "subsha1"
msgstr "subsha1"
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
msgid "SHA1 of submodule's HEAD"
msgstr "子模块头指针的 SHA1"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
msgid "git submodule--helper run-update-procedure [<options>] <path>"
msgstr "git submodule--helper run-update-procedure [<选项>] <路径>"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 文件中的设置"
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名称> [<值>]"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名称>"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "抑制设置子模组 URL 的输出"
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "设置默认跟踪分支为 master"
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "设置默认跟踪分支"
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "需要 --branch 或 --default"
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 和 --default 是互斥的"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：\n"
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n"
"的含义，使用 '--name' 选项指定另外的名称。"
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "无法检出子模组 '%s'"
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "无法添加子模组 '%s'"
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "无法注册子模组 '%s'"
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
#, c-format
msgid "'%s' already exists in the index"
msgstr "'%s' 已经存在于索引中"
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "'%s' 已经存在于索引中且不是一个子模组"
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
msgid "branch of repository to add as submodule"
msgstr "要添加为子模组的仓库的分支"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
msgid "allow adding an otherwise ignored submodule path"
msgstr "允许添加一个被忽略的子模组路径"
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
msgid "print only error messages"
msgstr "只打印错误消息"
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
msgid "borrow the objects from reference repositories"
msgstr "从引用仓库中借用对象"
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' 不是一个有效的子模组名称"
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:326
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:333
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n 不兼容"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "-n 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "只允许一个 -F 或 -m 选项。"
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "'%s' 选项只允许用在列表显示模式"
-#: builtin/tag.c:593
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:598
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:629
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
-msgstr "创建目录 %s 失败"
+msgstr "无法创建目录 %s"
#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
-msgstr "删除文件 %s 失败"
+msgstr "无法删除文件 %s"
#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
-msgstr "删除目录 %s 失败"
+msgstr "无法删除目录 %s"
#: builtin/update-index.c:138
#, c-format
msgid "initializing"
msgstr "初始化"
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b、-B 和 --detach 是互斥的"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason 需要 --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
msgid "added with --lock"
msgstr "由 --lock 添加"
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr "显示扩展的注释和原因（如果有）"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to move '%s' to '%s'"
-msgstr "移动 '%s' 到 '%s' 失败"
+msgstr "无法移动 '%s' 到 '%s'"
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
#, c-format
msgid "failed to run 'git status' on '%s'"
-msgstr "在 '%s' 中执行 'git status' 失败"
+msgstr "无法在 '%s' 中执行 'git status'"
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
-msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
+msgstr "无法在 '%s' 中执行 'git status'，退出码 %d"
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
#, c-format
msgid "repair: %s: %s"
msgstr "修理：%s：%s"
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
#, c-format
msgid "error: %s: %s"
msgstr "错误：%s：%s"
"帮助。\n"
"有关系统的概述，查看 'git help git'。"
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "没有为 --git-dir 提供目录\n"
+msgid "no directory given for '%s' option\n"
+msgstr "没有为 '%s' 选项提供目录\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "没有为 --namespace 提供命名空间\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "没有为 --work-tree 提供目录\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgid "no config key given for --config-env\n"
msgstr "没有为 --config-env 提供配置名称\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "没有为 -C 提供目录\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgid "recursive alias: %s"
msgstr "递归的别名：%s"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "在标准输出写入失败"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "到标准输出的未知写入错误"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:832
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:882
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:895
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
"用法：%s\n"
"\n"
-#: git.c:915
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:927
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
-msgstr "运行命令 '%s' 失败：%s\n"
+msgstr "无法运行命令 '%s'：%s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "不是 git 仓库"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile 需要 --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args 只能和 --packfile 一起使用"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "未处理的选项"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的来自 git 的命令 '%s'"
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "编译器信息不可用\n"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "需要一个工作目录"
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "libc 信息不可用\n"
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "无法找到登记根"
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr "参数"
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "无法切换到 '%s'"
-#: list-objects-filter-options.h:95
-msgid "object filtering"
-msgstr "对象过滤"
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "无法配置 %s=%s"
-#: parse-options.h:183
-msgid "expiry-date"
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "无法配置 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar 登记需要一个工作树"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "远程 HEAD 不是一个分支：'%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr "无法从远程获取默认分支名称；使用本地默认值"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "无法获取默认分支名称"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "无法取消注册仓库"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "无法删除登记目录"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "克隆后要检出的分支"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "在克隆时，创建完整的工作目录"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "只下载要检出的分支的元信息"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "无法从 '%s' 猜测工作区名称"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "目录 '%s' 已存在"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "无法获取 '%s' 的默认分支"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "无法在 '%s' 中配置远程"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "无法配置 '%s'"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "部分克隆失败；尝试完整克隆"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "无法配置完整克隆"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 不带参数"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<登记>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "重新配置所有注册的登记"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <登记>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或者 <登记>，而不是两个一起"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "在 '%s' 的 git 仓库已消失"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <任务> [<登记>]\n"
+"任务：\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "没有此任务：'%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<登记>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <登记>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "拒绝删除当前工作目录"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "包括 Git 的版本"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "包括 Git 的构建选项"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <命令> [<选项>]\n"
+"\n"
+"命令：\n"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "编译器信息不可用\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "libc 信息不可用\n"
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr "参数"
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
+msgstr "对象过滤"
+
+#: parse-options.h:183
+msgid "expiry-date"
msgstr "到期时间"
#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:308
+#: parse-options.h:310
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:310
+#: parse-options.h:312
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:316
+#: parse-options.h:318
msgid "use <n> digits to display object names"
msgstr "用 <n> 位数字显示对象名"
-#: parse-options.h:335
+#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: parse-options.h:336
+#: parse-options.h:338
msgid "read pathspec from file"
msgstr "从文件读取路径表达式"
-#: parse-options.h:337
+#: parse-options.h:339
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "key"
msgstr "key"
-#: ref-filter.h:101
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "排序的字段名"
msgstr "显示联系人的规范名称和电子邮件"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "确保引用名称格式正确"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "切换分支或恢复工作区文件"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "从索引拷贝文件到工作区"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "确保引用名称格式正确"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "查找尚未应用到上游的提交"
msgstr "添加或解析提交说明中的结构化信息"
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git 仓库浏览器"
-
-#: command-list.h:117
msgid "Show commit logs"
msgstr "显示提交日志"
-#: command-list.h:118
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "显示索引和工作区中文件的信息"
-#: command-list.h:119
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "显示一个远程仓库的引用"
-#: command-list.h:120
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "显示一个树对象的内容"
-#: command-list.h:121
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "从单个电子邮件中提取补丁和作者身份"
-#: command-list.h:122
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "简单的 UNIX mbox 邮箱切分程序"
-#: command-list.h:123
+#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "运行任务以优化仓库数据"
-#: command-list.h:124
+#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "合并两个或更多开发历史"
-#: command-list.h:125
+#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "为了合并查找尽可能好的公共祖先提交"
-#: command-list.h:126
+#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "运行一个三路文件合并"
-#: command-list.h:127
+#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "对于需要合并的文件执行合并"
-#: command-list.h:128
+#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "与 git-merge-index 一起使用的标准向导程序"
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "在不动索引的情况下显示三路合并"
+
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "运行合并冲突解决工具以解决合并冲突"
#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "显示三路合并而不动索引"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "写入和校验多包索引"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "创建一个有额外验证的标签对象"
-#: command-list.h:133
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基于 ls-tree 的格式化文本创建一个树对象"
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "写入和校验多包索引"
+
+#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
# 查找给定版本的符号名称
-#: command-list.h:135
+#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "查找给定版本的符号名称"
-#: command-list.h:136
+#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "添加或检查对象注释"
-#: command-list.h:137
+#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "导入和提交到 Perforce 仓库中"
-#: command-list.h:138
+#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "创建对象的存档包"
-#: command-list.h:139
+#: command-list.h:138
msgid "Find redundant pack files"
msgstr "查找冗余的包文件"
-#: command-list.h:140
+#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "打包头和标签以实现高效的仓库访问"
-#: command-list.h:141
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "计算一个补丁的唯一 ID"
-#: command-list.h:142
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "删除对象库中所有不可达对象"
-#: command-list.h:143
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "删除已经在包文件中的多余对象"
-#: command-list.h:144
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "获取并整合另外的仓库或一个本地分支"
-#: command-list.h:145
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "更新远程引用和相关的对象"
-#: command-list.h:146
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "将一个 quilt 补丁集应用到当前分支。"
-#: command-list.h:147
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "比较两个提交范围（如一个分支的两个版本）"
-#: command-list.h:148
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "将树信息读取到索引"
-#: command-list.h:149
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "在另一个分支上重新应用提交"
-#: command-list.h:150
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "接收推送到仓库中的对象"
-#: command-list.h:151
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "管理 reflog 信息"
-#: command-list.h:152
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "管理已跟踪仓库"
-#: command-list.h:153
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "打包仓库中未打包对象"
-#: command-list.h:154
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "创建、列出、删除对象替换引用"
-#: command-list.h:155
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "生成待定更改的摘要"
-#: command-list.h:156
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "重用冲突合并的解决方案记录"
-#: command-list.h:157
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "重置当前 HEAD 到指定状态"
-#: command-list.h:158
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "恢复工作区文件"
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "回退一些现存提交"
-
-#: command-list.h:160
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "按时间顺序列出提交对象"
-#: command-list.h:161
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "选出并处理参数"
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "回退一些现存提交"
+
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "从工作区和索引中删除文件"
-#: command-list.h:163
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "通过电子邮件发送一组补丁"
-#: command-list.h:164
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "使用 Git 协议推送对象到另一个仓库"
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "为 shell 脚本准备的 Git 国际化设置代码"
+
#: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "常用的 Git shell 脚本设置代码"
+
+#: command-list.h:166
msgid "Restricted login shell for Git-only SSH access"
msgstr "只允许 Git SSH 访问的受限登录shell"
-#: command-list.h:166
+#: command-list.h:167
msgid "Summarize 'git log' output"
msgstr "'git log' 输出摘要"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show various types of objects"
msgstr "显示各种类型的对象"
-#: command-list.h:168
+#: command-list.h:169
msgid "Show branches and their commits"
msgstr "显示分支和提交"
-#: command-list.h:169
+#: command-list.h:170
msgid "Show packed archive index"
msgstr "显示打包归档索引"
-#: command-list.h:170
+#: command-list.h:171
msgid "List references in a local repository"
msgstr "显示本地仓库中的引用"
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "为 shell 脚本准备的 Git 国际化设置代码"
-
#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "常用的 Git shell 脚本设置代码"
-
-#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "初始化及修改稀疏检出"
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "将文件内容添加到暂存区"
+
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "贮藏脏工作区中的修改"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "将文件内容添加到索引"
-
-#: command-list.h:176
msgid "Show the working tree status"
msgstr "显示工作区状态"
-#: command-list.h:177
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "删除不必要的空白字符"
-#: command-list.h:178
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或检查子模组"
-#: command-list.h:179
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subersion 仓库和 Git 之间的双向操作"
-#: command-list.h:180
+#: command-list.h:179
msgid "Switch branches"
msgstr "切换分支"
-#: command-list.h:181
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "读取、修改和删除符号引用"
-#: command-list.h:182
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
-#: command-list.h:183
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "用 blob 数据对象的内容创建一个临时文件"
-#: command-list.h:184
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "从打包文件中解压缩对象"
-#: command-list.h:185
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "将工作区的文件内容注册到索引"
-#: command-list.h:186
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新存储于引用中的对象名称"
-#: command-list.h:187
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新辅助信息文件以帮助哑协议服务"
-#: command-list.h:188
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "将存档发送回 git-archive"
-#: command-list.h:189
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "将对象压缩包发送回 git-fetch-pack"
-#: command-list.h:190
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "显示一个Git逻辑变量"
-#: command-list.h:191
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "检查 GPG 提交签名"
-#: command-list.h:192
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "校验打包的Git存仓文件"
-#: command-list.h:193
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "检查标签的 GPG 签名"
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web 界面（Git 仓库的 web 前端）"
-
-#: command-list.h:195
+#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr "显示每一个提交引入的差异日志"
-#: command-list.h:196
+#: command-list.h:194
msgid "Manage multiple working trees"
msgstr "管理多个工作区"
-#: command-list.h:197
+#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr "从当前索引创建一个树对象"
-#: command-list.h:198
+#: command-list.h:196
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: command-list.h:199
+#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr "Git 命令行界面和约定"
-#: command-list.h:200
+#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr "面向开发人员的 Git 核心教程"
-#: command-list.h:201
+#: command-list.h:199
msgid "Providing usernames and passwords to Git"
msgstr "为 Git 提供用户名和口令"
-#: command-list.h:202
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "适合 CVS 用户的 Git 帮助"
-#: command-list.h:203
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "调整差异输出"
-#: command-list.h:204
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一组有用的最小命令集合"
-#: command-list.h:205
+#: command-list.h:203
msgid "Frequently asked questions about using Git"
msgstr "关于使用 Git 的常见问题"
-#: command-list.h:206
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Git 词汇表"
-#: command-list.h:207
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Git 使用的钩子"
-#: command-list.h:208
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Git 仓库浏览器"
+
+#: command-list.h:208
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "映射作者/提交者的名称和/或邮件地址"
-#: command-list.h:210
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: command-list.h:211
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Git 名字空间"
-#: command-list.h:212
+#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "与远程仓库交互的助手程序"
-#: command-list.h:213
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Git 仓库布局"
-#: command-list.h:214
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: command-list.h:215
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "将一个仓库安装到另外一个仓库中"
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Git 入门教程"
+
#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
-msgstr "一个 Git 教程：第二部分"
+msgstr "Git 入门教程：第二部分"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "一个 Git 教程"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web 界面（Git 仓库的 web 前端）"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgid "usage: $dashless $USAGE"
msgstr "用法：$dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切换目录到 $cdup，工作区的顶级目录"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支：您有未暂存的变更。"
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暂存的变更。"
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "为写入打开块编辑文件失败：%s"
+msgstr "无法为写入打开块编辑文件：%s"
#: git-add--interactive.perl:1121
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件：%s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起，只有 %d 个可用块。\n"
msgstr[1] "对不起，只有 %d 个可用块。\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的块\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起，不能拆分这个块\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起，不能编辑这个块\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "本地时间和 GMT 有不到一分钟间隔\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n"
"设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "为写入打开 %s 失败: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "致命错误：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"致命错误：%s:%d 超过 998 字符\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："
-
-#, c-format
-#~ msgid ""
-#~ "The following pathspecs didn't match any eligible path, but they do match "
-#~ "index\n"
-#~ "entries outside the current sparse checkout:\n"
-#~ msgstr ""
-#~ "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹"
-#~ "配：\n"
-
-#~ msgid ""
-#~ "Disable or modify the sparsity rules if you intend to update such entries."
-#~ msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。"
-
-#, c-format
-#~ msgid "could not set GIT_DIR to '%s'"
-#~ msgstr "不能设置 GIT_DIR 为 '%s'"
-
-#, c-format
-#~ msgid "unable to unpack %s header with --allow-unknown-type"
-#~ msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-
-#, c-format
-#~ msgid "unable to parse %s header with --allow-unknown-type"
-#~ msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-
-#~ msgid "open /dev/null failed"
-#~ msgstr "不能打开 /dev/null"
-
-#~ msgid ""
-#~ "after resolving the conflicts, mark the corrected paths\n"
-#~ "with 'git add <paths>' or 'git rm <paths>'\n"
-#~ "and commit the result with 'git commit'"
-#~ msgstr ""
-#~ "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-#~ "对修正后的文件做标记，然后用 'git commit' 提交"
-
-#~ msgid "open /dev/null or dup failed"
-#~ msgstr "不能打开或者复制 /dev/null"
-
-#~ msgid "attempting to use sparse-index without cone mode"
-#~ msgstr "尝试在没有 cone 模式下使用稀疏索引"
-
-#~ msgid "unable to update cache-tree, staying full"
-#~ msgstr "不能更新缓存树，保持完整"
-
-#, c-format
-#~ msgid "Could not open '%s' for writing."
-#~ msgstr "无法为写入打开 '%s'。"
-
-#, c-format
-#~ msgid "could not create archive file '%s'"
-#~ msgstr "不能创建归档文件 '%s'"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-#~ msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
-
-#~ msgid "--bisect-next-check requires 2 or 3 arguments"
-#~ msgstr "--bisect-next-check 需要 2 或 3 个参数"
-
-#, c-format
-#~ msgid "couldn't create a new file at '%s'"
-#~ msgstr "不能在 '%s' 创建新文件"
-
-#, c-format
-#~ msgid "git commit-tree: failed to open '%s'"
-#~ msgstr "git commit-tree：无法打开 '%s'"
-
-#, c-format
-#~ msgid "cannot open packfile '%s'"
-#~ msgstr "无法打开包文件 '%s'"
-
-#~ msgid "cannot store pack file"
-#~ msgstr "无法存储包文件"
-
-#~ msgid "cannot store index file"
-#~ msgstr "无法存储索引文件"
-
-#~ msgid "exclude patterns are read from <file>"
-#~ msgstr "从 <文件> 中读取排除模式"
-
-#, c-format
-#~ msgid "Unknown option for merge-recursive: -X%s"
-#~ msgstr "merge-recursive 的未知选项：-X%s"
-
-#, c-format
-#~ msgid "unusable todo list: '%s'"
-#~ msgstr "不可用的待办列表：'%s'"
-
-#~ msgid "git rebase--interactive [<options>]"
-#~ msgstr "git rebase--interactive [<选项>]"
-
-#~ msgid "rebase merge commits"
-#~ msgstr "对合并提交变基"
-
-#~ msgid "keep original branch points of cousins"
-#~ msgstr "保持兄弟提交的原始分支点"
-
-#~ msgid "move commits that begin with squash!/fixup!"
-#~ msgstr "移动以 squash!/fixup! 开头的提交"
-
-#~ msgid "sign commits"
-#~ msgstr "签名提交"
-
-#~ msgid "continue rebase"
-#~ msgstr "继续变基"
-
-#~ msgid "skip commit"
-#~ msgstr "跳过提交"
-
-#~ msgid "edit the todo list"
-#~ msgstr "变基待办列表"
-
-#~ msgid "show the current patch"
-#~ msgstr "显示当前补丁"
-
-#~ msgid "shorten commit ids in the todo list"
-#~ msgstr "缩短待办列表中的提交号"
-
-#~ msgid "expand commit ids in the todo list"
-#~ msgstr "扩展待办列表中的提交号"
-
-#~ msgid "check the todo list"
-#~ msgstr "检查待办列表"
-
-#~ msgid "rearrange fixup/squash lines"
-#~ msgstr "重新排列 fixup/squash 行"
-
-#~ msgid "insert exec commands in todo list"
-#~ msgstr "在待办列表中插入 exec 执行命令"
-
-#~ msgid "onto"
-#~ msgstr "onto"
-
-#~ msgid "restrict-revision"
-#~ msgstr "restrict-revision"
-
-#~ msgid "restrict revision"
-#~ msgstr "限制版本"
-
-#~ msgid "squash-onto"
-#~ msgstr "squash-onto"
-
-#~ msgid "squash onto"
-#~ msgstr "squash onto"
-
-#~ msgid "the upstream commit"
-#~ msgstr "上游提交"
-
-#~ msgid "head-name"
-#~ msgstr "head-name"
-
-#~ msgid "head name"
-#~ msgstr "head 名称"
-
-#~ msgid "rebase strategy"
-#~ msgstr "变基策略"
-
-#~ msgid "strategy-opts"
-#~ msgstr "strategy-opts"
-
-#~ msgid "strategy options"
-#~ msgstr "策略选项"
-
-#~ msgid "switch-to"
-#~ msgstr "切换到"
-
-#~ msgid "the branch or commit to checkout"
-#~ msgstr "要检出的分支或提交"
-
-#~ msgid "onto-name"
-#~ msgstr "onto-name"
-
-#~ msgid "onto name"
-#~ msgstr "onto name"
-
-#~ msgid "cmd"
-#~ msgstr "cmd"
-
-#~ msgid "the command to run"
-#~ msgstr "要执行的命令"
-
-#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-#~ msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-
-#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-
-#~ msgid ""
-#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-#~ msgstr ""
-#~ "错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-
-#~ msgid ""
-#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
-#~ "--name <name>"
-#~ msgstr ""
-#~ "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --"
-#~ "name <名称>"
-
-#, c-format
-#~ msgid "failed to create file %s"
-#~ msgstr "创建文件 %s 失败"
-
-#~ msgid "exit immediately after initial ref advertisement"
-#~ msgstr "在初始的引用广告后立即退出"
-
-#, c-format
-#~ msgid "socket/pipe already in use: '%s'"
-#~ msgstr "套接字/管道已在使用：'%s'"
-
-#, c-format
-#~ msgid "could not start server on: '%s'"
-#~ msgstr "不能启动服务于：'%s'"
-
-#~ msgid "could not spawn daemon in the background"
-#~ msgstr "无法在后台生成守护进程"
-
-#~ msgid "waitpid failed"
-#~ msgstr "waitpid 失败"
-
-#~ msgid "daemon not online yet"
-#~ msgstr "守护进程尚未上线"
-
-#~ msgid "daemon failed to start"
-#~ msgstr "守护进程无法启动"
-
-#~ msgid "waitpid is confused"
-#~ msgstr "waitpid 迷惑了"
-
-#~ msgid "daemon has not shutdown yet"
-#~ msgstr "守护进程尚未关闭"
-
-#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
-#~ msgstr "不支持协议限制，因为 cURL < 7.19.4"
-
-#, sh-format
-#~ msgid "running $command"
-#~ msgstr "运行 $command"
-
-#, sh-format
-#~ msgid "'$sm_path' does not have a commit checked out"
-#~ msgstr "'$sm_path' 没有检出的提交"
-
-#, sh-format
-#~ msgid "Submodule path '$displaypath': '$command $sha1'"
-#~ msgstr "子模组 '$displaypath'：'$command $sha1'"
-
-#~ msgid "Applied autostash."
-#~ msgstr "已应用 autostash。"
-
-#, sh-format
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "不能存储 $stash_sha1"
-
-#~ msgid ""
-#~ "Applying autostash resulted in conflicts.\n"
-#~ "Your changes are safe in the stash.\n"
-#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-#~ msgstr ""
-#~ "应用 autostash 导致了冲突。\n"
-#~ "您的修改安全地保存在贮藏区中。\n"
-#~ "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#, sh-format
-#~ msgid "Rebasing ($new_count/$total)"
-#~ msgstr "变基中（$new_count/$total）"
-
-#~ msgid ""
-#~ "\n"
-#~ "Commands:\n"
-#~ "p, pick <commit> = use commit\n"
-#~ "r, reword <commit> = use commit, but edit the commit message\n"
-#~ "e, edit <commit> = use commit, but stop for amending\n"
-#~ "s, squash <commit> = use commit, but meld into previous commit\n"
-#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
-#~ "message\n"
-#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
-#~ "d, drop <commit> = remove commit\n"
-#~ "l, label <label> = label current HEAD with a name\n"
-#~ "t, reset <label> = reset HEAD to a label\n"
-#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-#~ ". create a merge commit using the original merge commit's\n"
-#~ ". message (or the oneline, if no original merge commit was\n"
-#~ ". specified). Use -c <commit> to reword the commit message.\n"
-#~ "\n"
-#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "命令:\n"
-#~ "p, pick <提交> = 使用提交\n"
-#~ "r, reword <提交> = 使用提交，但修改提交说明\n"
-#~ "e, edit <提交> = 使用提交，但停下来修补\n"
-#~ "s, squash <提交> = 使用提交，但挤压到前一个提交\n"
-#~ "f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"
-#~ "x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
-#~ "d, drop <提交> = 删除提交\n"
-#~ "l, label <标签> = 为当前 HEAD 打上标签\n"
-#~ "t, reset <标签> = 重置 HEAD 到该标签\n"
-#~ "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
-#~ ". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
-#~ ". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
-#~ ". -c <提交> 可以编辑提交说明。\n"
-#~ "\n"
-#~ "可以对这些行重新排序，将从上至下执行。\n"
-
-#, sh-format
-#~ msgid ""
-#~ "You can amend the commit now, with\n"
-#~ "\n"
-#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "Once you are satisfied with your changes, run\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-#~ msgstr ""
-#~ "您现在可以修补这个提交，使用\n"
-#~ "\n"
-#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "当您对变更感到满意，执行\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid "$sha1: not a commit that can be picked"
-#~ msgstr "$sha1：不是一个可以被拣选的提交"
-
-#, sh-format
-#~ msgid "Invalid commit name: $sha1"
-#~ msgstr "无效的提交名：$sha1"
-
-#~ msgid "Cannot write current commit's replacement sha1"
-#~ msgstr "不能写入当前提交的替代 sha1"
-
-#, sh-format
-#~ msgid "Fast-forward to $sha1"
-#~ msgstr "快进到 $sha1"
-
-#, sh-format
-#~ msgid "Cannot fast-forward to $sha1"
-#~ msgstr "不能快进到 $sha1"
-
-#, sh-format
-#~ msgid "Cannot move HEAD to $first_parent"
-#~ msgstr "不能移动 HEAD 到 $first_parent"
-
-#, sh-format
-#~ msgid "Refusing to squash a merge: $sha1"
-#~ msgstr "拒绝挤压一个合并：$sha1"
-
-#, sh-format
-#~ msgid "Error redoing merge $sha1"
-#~ msgstr "无法重做合并 $sha1"
-
-#, sh-format
-#~ msgid "Could not pick $sha1"
-#~ msgstr "不能拣选 $sha1"
-
-#, sh-format
-#~ msgid "This is the commit message #${n}:"
-#~ msgstr "这是提交说明 #${n}："
-
-#, sh-format
-#~ msgid "The commit message #${n} will be skipped:"
-#~ msgstr "提交说明 #${n} 将被跳过："
-
-#, sh-format
-#~ msgid "This is a combination of $count commit."
-#~ msgid_plural "This is a combination of $count commits."
-#~ msgstr[0] "这是一个 $count 个提交的组合。"
-#~ msgstr[1] "这是一个 $count 个提交的组合。"
-
-#, sh-format
-#~ msgid "Cannot write $fixup_msg"
-#~ msgstr "不能写入 $fixup_msg"
-
-#~ msgid "This is a combination of 2 commits."
-#~ msgstr "这是一个 2 个提交的组合。"
-
-#, sh-format
-#~ msgid "Could not apply $sha1... $rest"
-#~ msgstr "不能应用 $sha1... $rest"
-
-#, sh-format
-#~ msgid ""
-#~ "Could not amend commit after successfully picking $sha1... $rest\n"
-#~ "This is most likely due to an empty commit message, or the pre-commit "
-#~ "hook\n"
-#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
-#~ "before\n"
-#~ "you are able to reword the commit."
-#~ msgstr ""
-#~ "不能在成功拣选 $sha1... $rest 之后修补提交\n"
-#~ "这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-"
-#~ "commit\n"
-#~ "钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-
-#, sh-format
-#~ msgid "Stopped at $sha1_abbrev... $rest"
-#~ msgstr "停止在 $sha1_abbrev... $rest"
-
-#, sh-format
-#~ msgid "Cannot '$squash_style' without a previous commit"
-#~ msgstr "没有父提交的情况下不能 '$squash_style'"
-
-#, sh-format
-#~ msgid "Executing: $rest"
-#~ msgstr "执行：$rest"
-
-#, sh-format
-#~ msgid "Execution failed: $rest"
-#~ msgstr "执行失败：$rest"
-
-#~ msgid "and made changes to the index and/or the working tree"
-#~ msgstr "并且修改索引和/或工作区"
-
-#~ msgid ""
-#~ "You can fix the problem, and then run\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-#~ msgstr ""
-#~ "您可以解决这个问题，然后运行\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid ""
-#~ "Execution succeeded: $rest\n"
-#~ "but left changes to the index and/or the working tree\n"
-#~ "Commit or stash your changes, and then run\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-#~ msgstr ""
-#~ "执行成功：$rest\n"
-#~ "但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid "Unknown command: $command $sha1 $rest"
-#~ msgstr "未知命令：$command $sha1 $rest"
-
-#~ msgid "Please fix this using 'git rebase --edit-todo'."
-#~ msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-
-#, sh-format
-#~ msgid "Successfully rebased and updated $head_name."
-#~ msgstr "成功变基并更新 $head_name。"
-
-#~ msgid "Could not remove CHERRY_PICK_HEAD"
-#~ msgstr "不能删除 CHERRY_PICK_HEAD"
-
-#, sh-format
-#~ msgid ""
-#~ "You have staged changes in your working tree.\n"
-#~ "If these changes are meant to be\n"
-#~ "squashed into the previous commit, run:\n"
-#~ "\n"
-#~ " git commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "If they are meant to go into a new commit, run:\n"
-#~ "\n"
-#~ " git commit $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "In both cases, once you're done, continue with:\n"
-#~ "\n"
-#~ " git rebase --continue\n"
-#~ msgstr ""
-#~ "您已暂存了工作区的修改。如果这些修改要挤压到前一个提交，执行：\n"
-#~ "\n"
-#~ " git commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "如果这些变更要形成一个新提交，执行：\n"
-#~ "\n"
-#~ " git commit $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "无论哪种情况，当您完成提交，继续执行：\n"
-#~ "\n"
-#~ " git rebase --continue\n"
-
-#~ msgid "Error trying to find the author identity to amend commit"
-#~ msgstr "在修补提交中查找作者信息时遇到错误"
-
-#~ msgid ""
-#~ "You have uncommitted changes in your working tree. Please commit them\n"
-#~ "first and then run 'git rebase --continue' again."
-#~ msgstr ""
-#~ "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-
-#~ msgid "Could not commit staged changes."
-#~ msgstr "不能提交暂存的修改。"
-
-#~ msgid "Could not execute editor"
-#~ msgstr "无法运行编辑器"
-
-#, sh-format
-#~ msgid "Could not checkout $switch_to"
-#~ msgstr "不能检出 $switch_to"
-
-#~ msgid "No HEAD?"
-#~ msgstr "没有 HEAD？"
-
-#, sh-format
-#~ msgid "Could not create temporary $state_dir"
-#~ msgstr "不能创建临时 $state_dir"
-
-#~ msgid "Could not mark as interactive"
-#~ msgstr "不能标记为交互式"
-
-#, sh-format
-#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-#~ msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-#~ msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-
-#~ msgid "Note that empty commits are commented out"
-#~ msgstr "注意空提交已被注释掉"
-
-#~ msgid "Could not init rewritten commits"
-#~ msgstr "不能对重写提交进行初始化"
-
-#~ msgid "Cannot rebase: You have unstaged changes."
-#~ msgstr "不能变基：您有未暂存的变更。"
-
-#~ msgid "Cannot pull with rebase: You have unstaged changes."
-#~ msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-
-#~ msgid "Cannot rebase: Your index contains uncommitted changes."
-#~ msgstr "不能变基：您的索引中包含未提交的变更。"
-
-#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-#~ msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
projects / thirdparty / git.git / commitdiff
