diff options
| -rw-r--r-- | po/bg.po | 146 | ||||
| -rw-r--r-- | po/ca.po | 4617 | ||||
| -rw-r--r-- | po/de.po | 4691 | ||||
| -rw-r--r-- | po/fr.po | 926 |
4 files changed, 5584 insertions, 4796 deletions
@@ -115,8 +115,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-04-30 18:50+0200\n" -"PO-Revision-Date: 2017-04-30 18:55+0200\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"PO-Revision-Date: 2017-05-07 09:24+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -1247,7 +1247,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -1256,7 +1256,7 @@ msgstr "„%s“ не може да се отвори" msgid "Repository lacks these prerequisite commits:" msgstr "В хранилището липсват следните необходими подавания:" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 #: builtin/merge.c:359 builtin/shortlog.c:176 @@ -1322,7 +1322,7 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:40 sequencer.c:1572 builtin/am.c:419 builtin/am.c:455 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 #: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" @@ -2579,9 +2579,9 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:2375 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 #, c-format -msgid "could not stat '%s" +msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" #: read-cache.c:2388 @@ -3056,12 +3056,12 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:294 sequencer.c:1675 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" @@ -3071,12 +3071,12 @@ msgstr "в „%s“ не може да се пише" msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "„%s“ не може да се завърши." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:257 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 #: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" @@ -3251,7 +3251,7 @@ msgstr "неуспешно извличане на съобщението за msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1071 sequencer.c:1820 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" @@ -3280,132 +3280,132 @@ msgstr "git %s: неуспешно изчитане на индекса" msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:1302 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:1310 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:1342 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." -#: sequencer.c:1349 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:1351 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:1356 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:1367 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:1369 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:1432 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" -#: sequencer.c:1435 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:1492 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:1530 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "" "в момента вече се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1531 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“" -#: sequencer.c:1534 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "директорията за секвенсора „%s“ не може да бъде създадена" -#: sequencer.c:1548 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:1604 sequencer.c:2159 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:1606 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:1608 sequencer.c:1642 +#: sequencer.c:1615 sequencer.c:1649 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:1628 builtin/grep.c:910 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:1630 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:1631 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:1637 +#: sequencer.c:1644 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:1648 +#: sequencer.c:1655 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:1785 sequencer.c:2058 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:1825 builtin/difftool.c:616 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:1841 +#: sequencer.c:1848 msgid "could not read index" msgstr "индексът не може да бъде прочетен" -#: sequencer.c:1846 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3420,11 +3420,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1852 +#: sequencer.c:1859 msgid "and made changes to the index and/or the working tree\n" msgstr "и промени индекса и/или работното дърво\n" -#: sequencer.c:1858 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3441,17 +3441,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1913 git-rebase.sh:169 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "Автоматично скатаното е приложено." -#: sequencer.c:1925 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:1927 git-rebase.sh:173 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3462,57 +3462,57 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:2009 +#: sequencer.c:2016 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:2036 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:2066 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:2070 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:2077 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:2084 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:2168 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:2173 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:2182 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:2184 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:2186 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:2189 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3522,21 +3522,21 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:2199 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:2279 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:2283 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:2316 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" @@ -13376,7 +13376,7 @@ msgstr "директория за определянето на относите msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" @@ -13693,30 +13693,6 @@ msgstr "липсва съобщение за етикета" msgid "The tag message has been left in %s\n" msgstr "Съобщението за етикета е запазено във файла „%s“\n" -#: builtin/tag.c:312 -msgid "tag: tagging " -msgstr "tag: етикиране " - -#: builtin/tag.c:320 -msgid "object of unknown type" -msgstr "обект от непознат вид" - -#: builtin/tag.c:327 -msgid "commit object" -msgstr "обект-подаване" - -#: builtin/tag.c:335 -msgid "tree object" -msgstr "обект-дърво" - -#: builtin/tag.c:338 -msgid "blob object" -msgstr "обект-blob" - -#: builtin/tag.c:341 -msgid "other tag object" -msgstr "друг обект-етикет" - #: builtin/tag.c:397 msgid "list tag names" msgstr "извеждане на имената на етикетите" @@ -1,4 +1,3 @@ - # Catalan translations for Git. # Copyright (C) 2014 Alex Henrie <alexhenrie24@gmail.com> # This file is distributed under the same license as the Git package. @@ -9,8 +8,10 @@ # # Anglès | Català # -----------------+--------------------------------- +# ahead | davant per # amend | esmenar # broken | malmès +# delta | diferència # dry | simulació # deprecated | en desús # hunk | tros @@ -36,15 +37,12 @@ # stage | «stage» # squash | «squash» # unstage | «unstage» - - - msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-02-18 01:00+0800\n" -"PO-Revision-Date: 2017-02-16 19:55+0100\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"PO-Revision-Date: 2017-05-07 19:55+0100\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -97,7 +95,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:114 builtin/merge.c:1206 +#: advice.c:114 builtin/merge.c:1185 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." @@ -369,7 +367,7 @@ msgstr "el pedaç ha fallat: %s:%ld" msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" @@ -493,7 +491,7 @@ msgstr "canvi de mode per a %s, el qual no està en el HEAD actual" msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí '%s'" @@ -571,7 +569,7 @@ msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..." msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" @@ -599,26 +597,26 @@ msgstr "entrada no reconeguda" msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4824 +#: apply.c:4823 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç '%s': %s" -#: apply.c:4849 +#: apply.c:4850 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "s'ha omès %d error d'espai en blanc" msgstr[1] "s'han omès %d errors d'espai en blanc" -#: apply.c:4855 apply.c:4870 +#: apply.c:4856 apply.c:4871 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línia afegeix errors d'espai en blanc." msgstr[1] "%d línies afegeixen errors d'espai en blanc." -#: apply.c:4863 +#: apply.c:4864 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -627,138 +625,138 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 #: git-add--interactive.perl:239 msgid "path" msgstr "camí" -#: apply.c:4911 +#: apply.c:4912 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:4914 +#: apply.c:4915 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:4916 builtin/am.c:2286 +#: apply.c:4917 builtin/am.c:2285 msgid "num" msgstr "número" -#: apply.c:4917 +#: apply.c:4918 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:4920 +#: apply.c:4921 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4922 +#: apply.c:4923 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" -#: apply.c:4926 +#: apply.c:4927 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: apply.c:4928 +#: apply.c:4929 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: apply.c:4930 +#: apply.c:4931 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: apply.c:4932 +#: apply.c:4933 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:4934 +#: apply.c:4935 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:4936 +#: apply.c:4937 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:4938 +#: apply.c:4939 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:4940 +#: apply.c:4941 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: apply.c:4942 +#: apply.c:4943 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:4947 +#: apply.c:4948 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> línies de context coincideixin" -#: apply.c:4948 builtin/am.c:2265 +#: apply.c:4949 builtin/am.c:2264 msgid "action" msgstr "acció" -#: apply.c:4949 +#: apply.c:4950 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detecta les línies noves o modificades que tinguin errors d'espai en blanc" -#: apply.c:4952 apply.c:4955 +#: apply.c:4953 apply.c:4956 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:4958 +#: apply.c:4959 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:4960 +#: apply.c:4961 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:4962 +#: apply.c:4963 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:4964 +#: apply.c:4965 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:4967 +#: apply.c:4968 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: apply.c:4970 +#: apply.c:4971 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" -#: apply.c:4972 builtin/am.c:2274 +#: apply.c:4973 builtin/am.c:2273 msgid "root" msgstr "arrel" -#: apply.c:4973 +#: apply.c:4974 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" @@ -781,103 +779,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer" -#: archive.c:429 +#: archive.c:417 msgid "fmt" msgstr "format" -#: archive.c:429 +#: archive.c:417 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:430 builtin/log.c:1429 +#: archive.c:418 builtin/log.c:1436 msgid "prefix" msgstr "prefix" -#: archive.c:431 +#: archive.c:419 msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 #: parse-options.h:153 msgid "file" msgstr "fitxer" -#: archive.c:433 builtin/archive.c:89 +#: archive.c:421 builtin/archive.c:89 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:435 +#: archive.c:423 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:436 +#: archive.c:424 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:437 +#: archive.c:425 msgid "store only" msgstr "només emmagatzema" -#: archive.c:438 +#: archive.c:426 msgid "compress faster" msgstr "comprimeix més ràpidament" -#: archive.c:446 +#: archive.c:434 msgid "compress better" msgstr "comprimeix millor" -#: archive.c:449 +#: archive.c:437 msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "dipòsit" -#: archive.c:452 builtin/archive.c:91 +#: archive.c:440 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'arxiu del dipòsit remot <dipòsit>" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "ordre" -#: archive.c:454 builtin/archive.c:93 +#: archive.c:442 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remota" -#: archive.c:461 +#: archive.c:449 msgid "Unexpected option --remote" msgstr "Opció inesperada --remote" -#: archive.c:463 +#: archive.c:451 msgid "Option --exec can only be used together with --remote" msgstr "L'opció --exec només es pot usar junt amb --remote" -#: archive.c:465 +#: archive.c:453 msgid "Unexpected option --output" msgstr "Opció inesperada --output" -#: archive.c:487 +#: archive.c:475 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut '%s'" -#: archive.c:494 +#: archive.c:482 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Paràmetre no admès per al format '%s': -%d" -#: attr.c:263 +#: attr.c:212 +#, , c-format +msgid "%.*s is not a valid attribute name" +msgstr "%.*s no és un nom d'atribut vàlid" + +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -885,27 +888,27 @@ msgstr "" "Els patrons negatius s'ignoren en els atributs de git\n" "Useu '\\!' per exclamació capdavantera literal." -#: bisect.c:441 +#: bisect.c:444 #, c-format msgid "Could not open file '%s'" msgstr "No s'ha pogut obrir el fitxer '%s'" -#: bisect.c:446 +#: bisect.c:449 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer '%s': %s" -#: bisect.c:655 +#: bisect.c:657 #, c-format msgid "We cannot bisect more!\n" msgstr "No podem bisecar més!\n" -#: bisect.c:708 +#: bisect.c:710 #, c-format msgid "Not a valid commit name %s" msgstr "No és un nom de comissió vàlid %s" -#: bisect.c:732 +#: bisect.c:734 #, c-format msgid "" "The merge base %s is bad.\n" @@ -914,7 +917,7 @@ msgstr "" "La base de fusió %s és errònia.\n" "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" -#: bisect.c:737 +#: bisect.c:739 #, c-format msgid "" "The merge base %s is new.\n" @@ -923,7 +926,7 @@ msgstr "" "La base de fusió %s és nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:742 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is %s.\n" @@ -932,7 +935,7 @@ msgstr "" "La base de fusió %s és %s.\n" "Això vol dir que la primera comissió '%s' és entre %s i [%s].\n" -#: bisect.c:750 +#: bisect.c:752 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -943,7 +946,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" -#: bisect.c:763 +#: bisect.c:765 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -955,45 +958,45 @@ msgstr "" "i %s.\n" "Continuem de totes maneres." -#: bisect.c:798 +#: bisect.c:800 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: bisect.c:849 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer '%s'" -#: bisect.c:917 +#: bisect.c:919 #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer '%s'" -#: bisect.c:947 +#: bisect.c:949 msgid "reading bisect refs failed" msgstr "la lectura de les referències de bisecció ha fallat" -#: bisect.c:967 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdós %s i %s\n" -#: bisect.c:975 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -"No s'ha trobat cap comissió probable.\n" +"No s'ha trobat cap comissió comprovable.\n" "Potser heu començat amb paràmetres de camí dolents?\n" -#: bisect.c:994 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1002,7 +1005,7 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with #. "(roughly %d steps)" translation -#: bisect.c:998 +#: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1150,7 +1153,7 @@ msgstr "No és un punt de ramificació vàlid: '%s'." msgid "'%s' is already checked out at '%s'" msgstr "'%s' ja s'ha agafat a '%s'" -#: branch.c:363 +#: branch.c:364 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "La HEAD de l'arbre de treball %s no està actualitzat" @@ -1165,7 +1168,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" @@ -1174,10 +1177,10 @@ msgstr "no s'ha pogut obrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:360 builtin/shortlog.c:177 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 +#: builtin/merge.c:359 builtin/shortlog.c:176 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" @@ -1216,7 +1219,7 @@ msgstr "El rev-list s'ha mort" msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència '%s'" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 #, c-format msgid "unrecognized argument: %s" msgstr "paràmetre no reconegut: %s" @@ -1239,8 +1242,8 @@ msgstr "L'index-pack s'ha mort" msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" @@ -1250,7 +1253,7 @@ msgstr "no s'ha pogut analitzar %s" msgid "%s %s is not a commit!" msgstr "%s %s no és una comissió!" -#: commit.c:1514 +#: commit.c:1511 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" @@ -1265,138 +1268,157 @@ msgstr "" msgid "memory exhausted" msgstr "memòria esgotada" -#: config.c:518 +#: config.c:191 +msgid "relative config include conditionals must come from files" +msgstr "" + +#: config.c:711 #, c-format msgid "bad config line %d in blob %s" msgstr "línia de configuració %d errònia en el blob %s" -#: config.c:522 +#: config.c:715 #, c-format msgid "bad config line %d in file %s" msgstr "línia de configuració %d errònia en el fitxer %s" -#: config.c:526 +#: config.c:719 #, c-format msgid "bad config line %d in standard input" msgstr "línia de configuració %d errònia en l'entrada estàndard" -#: config.c:530 +#: config.c:723 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "línia de configuració %d errònia en el blob de submòdul %s" -#: config.c:534 +#: config.c:727 #, c-format msgid "bad config line %d in command line %s" msgstr "línia de configuració %d errònia en la línia d'ordres %s" -#: config.c:538 +#: config.c:731 #, c-format msgid "bad config line %d in %s" msgstr "línia de configuració %d errònia en %s" -#: config.c:657 +#: config.c:859 msgid "out of range" msgstr "fora de rang" -#: config.c:657 +#: config.c:859 msgid "invalid unit" msgstr "unitat no vàlida" -#: config.c:663 +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuració numèric erroni '%s' per '%s': %s" -#: config.c:668 +#: config.c:870 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor de configuració numèric erroni '%s' per '%s' en el blob %s: %s" -#: config.c:671 +#: config.c:873 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor de configuració numèric '%s' erroni per '%s' en el fitxer %s: %s" -#: config.c:674 +#: config.c:876 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valor de configuració numèric '%s' erroni per '%s' en l'entrada estàndard: %s" -#: config.c:677 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul " "%s: %s" -#: config.c:680 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valor de configuració numèric '%s' erroni per '%s' en la línia d'ordres %s: " "%s" -#: config.c:683 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s" -#: config.c:770 +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "s'ha produït un error en expandir el directori d'usuari en: '%s'" -#: config.c:865 config.c:876 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib dolent %d" -#: config.c:993 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1149 +#: config.c:1359 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressió de paquet %d Erroni" -#: config.c:1339 +#: config.c:1557 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:1389 +#: config.c:1611 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:1743 +#: config.c:1970 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "%s no vàlid: %s" + +#: config.c:1991 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" + +#: config.c:2017 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "" + +#: config.c:2028 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar '%s' de la configuració de la línia d'ordres" -#: config.c:1745 +#: config.c:2030 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració '%s' errònia en el fitxer '%s' a la línia %d" -#: config.c:1804 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2225 config.c:2450 +#: config.c:2423 config.c:2648 #, c-format msgid "fstat on %s failed" msgstr "ha fallat fstat a %s" -#: config.c:2343 +#: config.c:2541 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir '%s' a '%s'" -#: config.c:2345 +#: config.c:2543 builtin/remote.c:774 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desestablir '%s'" @@ -1572,20 +1594,20 @@ msgstr "" "S'han trobat errors en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:3085 +#: diff.c:3102 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:3411 +#: diff.c:3428 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check i -s són mutualment exclusius" -#: diff.c:3501 +#: diff.c:3518 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:3664 +#: diff.c:3681 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1594,22 +1616,22 @@ msgstr "" "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3678 +#: diff.c:3695 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" "S'ha produït un error en analitzar el paràmetre d'opció de --submodule: '%s'" -#: diff.c:4696 +#: diff.c:4719 msgid "inexact rename detection was skipped due to too many files." msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers." -#: diff.c:4699 +#: diff.c:4722 msgid "only found copies from modified paths due to too many files." msgstr "" "només s'han trobat còpies des de camins modificats a causa de massa fitxers." -#: diff.c:4702 +#: diff.c:4725 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1617,187 +1639,212 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:1862 +#: dir.c:1899 msgid "failed to get kernel name and information" msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" -#: dir.c:1981 +#: dir.c:2018 msgid "Untracked cache is disabled on this system or location." msgstr "" "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." -#: dir.c:2759 +#: dir.c:2776 dir.c:2781 +#, c-format +msgid "could not create directories for %s" +msgstr "no s'ha pogut crear directoris per %s" + +#: dir.c:2806 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de '%s' a '%s'" -#: fetch-pack.c:213 +#: entry.c:280 +#, c-format +msgid "could not stat file '%s'" +msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'" + +#: fetch-pack.c:249 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:225 +#: fetch-pack.c:261 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut" -#: fetch-pack.c:243 +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "error remot: %s" + +#: fetch-pack.c:281 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut" -#: fetch-pack.c:295 +#: fetch-pack.c:333 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:381 +#: fetch-pack.c:419 #, c-format msgid "invalid shallow line: %s" msgstr "línia de shallow no vàlida: %s" -#: fetch-pack.c:387 +#: fetch-pack.c:425 #, c-format msgid "invalid unshallow line: %s" msgstr "línia d'unshallow no vàlida: %s" -#: fetch-pack.c:389 +#: fetch-pack.c:427 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:392 +#: fetch-pack.c:430 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:394 +#: fetch-pack.c:432 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:397 +#: fetch-pack.c:435 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:436 +#: fetch-pack.c:474 #, c-format msgid "got %s %d %s" msgstr "%s %d %s rebut" -#: fetch-pack.c:450 +#: fetch-pack.c:488 #, c-format msgid "invalid commit %s" msgstr "comissió no vàlida %s" -#: fetch-pack.c:483 +#: fetch-pack.c:521 msgid "giving up" msgstr "s'està rendint" -#: fetch-pack.c:493 progress.c:235 +#: fetch-pack.c:531 progress.c:235 msgid "done" msgstr "fet" -#: fetch-pack.c:505 +#: fetch-pack.c:543 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:551 +#: fetch-pack.c:589 #, c-format msgid "Marking %s as complete" msgstr "S'està marcant %s com a complet" -#: fetch-pack.c:697 +#: fetch-pack.c:737 #, c-format msgid "already have %s (%s)" msgstr "ja es té %s (%s)" -#: fetch-pack.c:735 +#: fetch-pack.c:775 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral" -#: fetch-pack.c:743 +#: fetch-pack.c:783 msgid "protocol error: bad pack header" msgstr "error de protocol: capçalera de paquet errònia" -#: fetch-pack.c:799 +#: fetch-pack.c:839 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:815 +#: fetch-pack.c:855 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:817 +#: fetch-pack.c:857 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:844 +#: fetch-pack.c:884 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:848 +#: fetch-pack.c:888 msgid "Server supports multi_ack_detailed" msgstr "El servidor accepta multi_ack_detailed" -#: fetch-pack.c:851 +#: fetch-pack.c:891 msgid "Server supports no-done" msgstr "El servidor accepta no-done" -#: fetch-pack.c:857 +#: fetch-pack.c:897 msgid "Server supports multi_ack" msgstr "El servidor accepta multi_ack" -#: fetch-pack.c:861 +#: fetch-pack.c:901 msgid "Server supports side-band-64k" msgstr "El servidor accepta side-band-64k" -#: fetch-pack.c:865 +#: fetch-pack.c:905 msgid "Server supports side-band" msgstr "El servidor accepta banda lateral" -#: fetch-pack.c:869 +#: fetch-pack.c:909 msgid "Server supports allow-tip-sha1-in-want" msgstr "El servidor accepta allow-tip-sha1-in-want" -#: fetch-pack.c:873 +#: fetch-pack.c:913 msgid "Server supports allow-reachable-sha1-in-want" msgstr "El servidor accepta allow-reachable-sha1-in-want" -#: fetch-pack.c:883 +#: fetch-pack.c:923 msgid "Server supports ofs-delta" msgstr "El servidor accepta ofs-delta" -#: fetch-pack.c:890 +#: fetch-pack.c:930 #, c-format msgid "Server version is %.*s" msgstr "La versió del servidor és %.*s" -#: fetch-pack.c:896 +#: fetch-pack.c:936 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:900 +#: fetch-pack.c:940 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:902 +#: fetch-pack.c:942 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:913 +#: fetch-pack.c:953 msgid "no common commits" msgstr "cap comissió en comú" -#: fetch-pack.c:925 +#: fetch-pack.c:965 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenció ha fallat." -#: fetch-pack.c:1087 +#: fetch-pack.c:1127 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" +#: fetch-pack.c:1149 +#, c-format +msgid "no such remote ref %s" +msgstr "no existeix la referència remota %s" + +#: fetch-pack.c:1152 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "El servidor no permet sol·licitar objectes no anunciats %s" + #: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg ha fallat en signar les dades" @@ -1816,17 +1863,17 @@ msgstr "s'ha produït un error en escriure la signatura separada a '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color invàlid '%.*s' en log.graphColors" -#: grep.c:1794 +#: grep.c:1796 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no s'ha pogut llegir %s" -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a '%s'" -#: grep.c:1822 +#: grep.c:1824 #, c-format msgid "'%s': short read" msgstr "'%s': lectura curta" @@ -1842,7 +1889,8 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" #: help.c:256 msgid "These are common Git commands used in various situations:" -msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:" +msgstr "" +"Aquestes són ordres del Git habitualment usades en diverses situacions:" #: help.c:321 #, c-format @@ -1896,7 +1944,7 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: ident.c:334 +#: ident.c:343 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1921,6 +1969,39 @@ msgstr "" "per a establir la identitat predeterminada del vostre compte.\n" "Ometeu --global per a establir la identitat només en aquest dipòsit.\n" +#: ident.c:367 +msgid "no email was given and auto-detection is disabled" +msgstr "no s'ha proporcionat cap adreça electrònica i la detecció automàtica està inhabilitada" + +#: ident.c:372 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "no s'ha pogut detectar automàticament una adreça de correu vàlida ('%s' rebut)" + +#: ident.c:382 +msgid "no name was given and auto-detection is disabled" +msgstr "no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada" + +#: ident.c:388 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "no s'ha pogut detectar automàticament el nom ('%s' rebut)" + +#: ident.c:396 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "" + +#: ident.c:402 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "" + +#: ident.c:417 builtin/commit.c:611 +#, c-format +msgid "invalid date format: %s" +msgstr "format de data no vàlid: %s" + #: lockfile.c:152 #, c-format msgid "" @@ -1950,8 +2031,8 @@ msgstr "No s'ha pogut crear '%s.lock': %s" msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 -#: builtin/checkout.c:588 builtin/clone.c:731 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 +#: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" @@ -2021,7 +2102,7 @@ msgstr "S'ha produït un error en executar la fusió interna" msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1088 merge-recursive.c:1102 +#: merge-recursive.c:1092 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2030,7 +2111,16 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre." -#: merge-recursive.c:1094 merge-recursive.c:1107 +#: merge-recursive.c:1097 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre." + +#: merge-recursive.c:1104 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2039,20 +2129,29 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1150 +#: merge-recursive.c:1109 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre a %s." + +#: merge-recursive.c:1143 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1150 +#: merge-recursive.c:1143 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1207 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1232 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2061,139 +2160,139 @@ msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " "branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1299 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " "nom %s->%s en %s" -#: merge-recursive.c:1332 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" -#: merge-recursive.c:1535 +#: merge-recursive.c:1528 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " "%s" -#: merge-recursive.c:1550 +#: merge-recursive.c:1543 #, c-format msgid "Adding merged %s" msgstr "S'està afegint %s fusionat" -#: merge-recursive.c:1557 merge-recursive.c:1771 +#: merge-recursive.c:1550 merge-recursive.c:1780 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1614 +#: merge-recursive.c:1607 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1617 +#: merge-recursive.c:1610 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:1670 +#: merge-recursive.c:1679 msgid "modify" msgstr "modificació" -#: merge-recursive.c:1670 +#: merge-recursive.c:1679 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1680 +#: merge-recursive.c:1689 msgid "content" msgstr "contingut" -#: merge-recursive.c:1687 +#: merge-recursive.c:1696 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:1723 +#: merge-recursive.c:1732 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:1737 +#: merge-recursive.c:1746 #, c-format msgid "Auto-merging %s" msgstr "S'està autofusionant %s" -#: merge-recursive.c:1741 git-submodule.sh:930 +#: merge-recursive.c:1750 git-submodule.sh:944 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1742 +#: merge-recursive.c:1751 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1836 +#: merge-recursive.c:1845 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:1862 +#: merge-recursive.c:1871 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1874 +#: merge-recursive.c:1883 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " "%s" -#: merge-recursive.c:1883 +#: merge-recursive.c:1892 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:1920 +#: merge-recursive.c:1929 msgid "Already up-to-date!" msgstr "Ja està al dia!" -#: merge-recursive.c:1929 +#: merge-recursive.c:1938 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:2012 +#: merge-recursive.c:2021 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:2025 +#: merge-recursive.c:2034 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:2064 +#: merge-recursive.c:2073 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2127 +#: merge-recursive.c:2136 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." @@ -2269,18 +2368,35 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nom d'objecte mal format '%s'" -#: path.c:826 +#: path.c:810 #, c-format msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" -#: pathspec.c:142 +#: pathspec.c:125 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "El caràcter d'escapament '\\' no està permès com a últim caràcter en un valor d'un atribut" + +#: pathspec.c:143 +msgid "Only one 'attr:' specification is allowed." +msgstr "només es permet una especificació 'attr:'." + +#: pathspec.c:146 +msgid "attr spec must not be empty" +msgstr "una especificació d'atribut no pot estar buida" + +#: pathspec.c:189 +#, c-format +msgid "invalid attribute name %s" +msgstr "nom d'atribut no vàlid %s" + +#: pathspec.c:254 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "els ajusts d'especificació de camí 'glob' i 'noglob' globals són " "incompatibles" -#: pathspec.c:149 +#: pathspec.c:261 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2288,52 +2404,52 @@ msgstr "" "l'ajust d'especificació de camí 'literal' global és incompatible amb tots " "els altres ajusts d'especificació de camí globals" -#: pathspec.c:188 +#: pathspec.c:301 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'" -#: pathspec.c:201 +#: pathspec.c:322 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'" -#: pathspec.c:206 +#: pathspec.c:327 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'" -#: pathspec.c:238 +#: pathspec.c:365 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'" -#: pathspec.c:293 pathspec.c:315 +#: pathspec.c:421 pathspec.c:443 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "L'especificació '%s' és en el submòdul '%.*s'" -#: pathspec.c:350 +#: pathspec.c:483 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' i 'glob' són incompatibles" -#: pathspec.c:363 +#: pathspec.c:496 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' és fora del dipòsit" -#: pathspec.c:451 +#: pathspec.c:584 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnemònic: '%c')" -#: pathspec.c:461 +#: pathspec.c:594 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s" +"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s" -#: pathspec.c:511 +#: pathspec.c:644 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2342,24 +2458,16 @@ msgstr "" "versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb " "tots els camins" -#: pathspec.c:535 +#: pathspec.c:668 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camí '%s' és més enllà d'un enllaç simbòlic" -#: pathspec.c:544 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" -msgstr "" -"No hi ha res a excloure per patrons :(exclusió).\n" -"Potser heu oblidat afegir o ':/' o '.' ?" - #: pretty.c:982 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: read-cache.c:1307 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2368,7 +2476,7 @@ msgstr "" "index.version està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1317 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2377,161 +2485,268 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: refs.c:576 builtin/merge.c:844 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#, c-format +msgid "could not stat '%s'" +msgstr "no s'ha pogut fer stat a '%s'" + +#: read-cache.c:2388 +#, c-format +msgid "unable to open git dir: %s" +msgstr "no s'ha pogut obrir el directori git: %s" + +#: read-cache.c:2400 +#, c-format +msgid "unable to unlink: %s" +msgstr "no s'ha pogut desenllaçar: %s" + +#: refs.c:620 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "No s'ha pogut obrir '%s' per a escriptura" -#: refs/files-backend.c:2481 +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "" + +#: refs/files-backend.c:1631 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" -#: refs/files-backend.c:2484 +#: refs/files-backend.c:1634 #, c-format msgid "could not delete references: %s" msgstr "no s'ha pogut suprimir les referències: %s" -#: refs/files-backend.c:2493 +#: refs/files-backend.c:1643 #, c-format msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: ref-filter.c:56 +#: ref-filter.c:35 wt-status.c:1780 +msgid "gone" +msgstr "no hi és" + +#: ref-filter.c:36 +#, c-format +msgid "ahead %d" +msgstr "davant per %d" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "darrere per %d" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" +msgstr "davant per %d, darrere per %d" + +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" -#: ref-filter.c:58 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:72 +#: ref-filter.c:120 +#, e, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "valor enter esperat pel nom de referència:lstrip=%s" + +#: ref-filter.c:124 #, c-format -msgid "unrecognized format: %%(%s)" -msgstr "format no reconegut: %%(%s)" +msgid "Integer value expected refname:rstrip=%s" +msgstr "valor enter esperat pel nom de referència:rstrip=%s" -#: ref-filter.c:78 +#: ref-filter.c:126 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "paràmetre %%(%s) desconegut: %s" + +#: ref-filter.c:166 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta paràmetres" -#: ref-filter.c:85 +#: ref-filter.c:173 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:92 +#: ref-filter.c:180 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) no accepta paràmetres" -#: ref-filter.c:111 +#: ref-filter.c:199 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat conté:lines=%s" -#: ref-filter.c:113 +#: ref-filter.c:201 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "paràmetre %%(contents) no reconegut: %s" -#: ref-filter.c:123 +#: ref-filter.c:214 +#, fuzzy, c-format +msgid "positive value expected objectname:short=%s" +msgstr "valor positiu esperat conté:lines=%s" + +#: ref-filter.c:218 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "paràmetre %%(objectname) no reconegut: %s" -#: ref-filter.c:145 +#: ref-filter.c:245 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posició>)" -#: ref-filter.c:157 +#: ref-filter.c:257 #, c-format msgid "unrecognized position:%s" msgstr "posició no reconeguda:%s" -#: ref-filter.c:161 +#: ref-filter.c:261 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:167 +#: ref-filter.c:267 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "paràmetre %%(align) no reconegut: %s" -#: ref-filter.c:171 +#: ref-filter.c:271 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'àtom %%(align)" -#: ref-filter.c:255 +#: ref-filter.c:286 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "paràmetre %%(if) no reconegut: %s" + +#: ref-filter.c:371 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:281 +#: ref-filter.c:397 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:383 +#: ref-filter.c:501 +#, fuzzy, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" + +#: ref-filter.c:561 +#, fuzzy, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" + +#: ref-filter.c:563 +#, fuzzy, c-format +msgid "format: %%(then) atom used more than once" +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" + +#: ref-filter.c:565 +#, fuzzy, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "format: manca l'àtom %%(end)" + +#: ref-filter.c:591 +#, fuzzy, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" + +#: ref-filter.c:593 +#, fuzzy, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" + +#: ref-filter.c:595 +#, fuzzy, c-format +msgid "format: %%(else) atom used more than once" +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" + +#: ref-filter.c:608 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" -#: ref-filter.c:435 +#: ref-filter.c:663 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:898 -msgid ":strip= requires a positive integer argument" -msgstr ":strip= requereix un paràmetre enter positiu" +#: ref-filter.c:1247 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(cap branca, s'està rebasant %s)" -#: ref-filter.c:903 +#: ref-filter.c:1250 #, c-format -msgid "ref '%s' does not have %ld components to :strip" -msgstr "la referència '%s' no té %ld components per a :strip" +msgid "(no branch, bisect started on %s)" +msgstr "(cap branca, bisecció començada en %s)" -#: ref-filter.c:1066 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: ref-filter.c:1256 #, c-format -msgid "unknown %.*s format %s" -msgstr "format de %.*s desconegut %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD separat a %s)" -#: ref-filter.c:1086 ref-filter.c:1117 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: ref-filter.c:1261 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD separat de %s)" + +#: ref-filter.c:1265 +msgid "(no branch)" +msgstr "(cap branca)" + +#: ref-filter.c:1420 ref-filter.c:1451 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1089 ref-filter.c:1120 +#: ref-filter.c:1423 ref-filter.c:1454 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ha fallat en %s per a %s" -#: ref-filter.c:1343 +#: ref-filter.c:1692 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a '%s'" -#: ref-filter.c:1410 +#: ref-filter.c:1759 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:1415 +#: ref-filter.c:1764 #, c-format msgid "ignoring broken ref %s" msgstr "s'està ignorant la referència trencada %s" -#: ref-filter.c:1670 +#: ref-filter.c:2028 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'àtom %%(end)" -#: ref-filter.c:1734 +#: ref-filter.c:2109 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" @@ -2680,15 +2895,25 @@ msgstr "s'ha produït un error en obrir /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) ha fallat" -#: send-pack.c:297 +#: send-pack.c:150 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s" + +#: send-pack.c:152 +#, c-format +msgid "remote unpack failed: %s" +msgstr "s'ha produït un error en el desempaquetament remot: %s" + +#: send-pack.c:315 msgid "failed to sign the push certificate" msgstr "s'ha produït un error en signar el certificat de pujada" -#: send-pack.c:410 +#: send-pack.c:428 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: send-pack.c:412 +#: send-pack.c:430 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2696,11 +2921,11 @@ msgstr "" "no s'està enviant una certificació de pujada perquè el destí receptor no " "admet pujar --signed" -#: send-pack.c:424 +#: send-pack.c:442 msgid "the receiving end does not support --atomic push" msgstr "el destí receptor no admet pujar --atomic" -#: send-pack.c:429 +#: send-pack.c:447 msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" @@ -2739,12 +2964,12 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:294 sequencer.c:1667 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar '%s'" -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a '%s'" @@ -2754,13 +2979,13 @@ msgstr "no s'ha pogut escriure a '%s'" msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a '%s'" -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "s'ha produït un error en finalitzar '%s'." -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 -#: builtin/commit.c:749 builtin/merge.c:1036 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 +#: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" @@ -2812,7 +3037,8 @@ msgid "" " git rebase --continue\n" msgstr "" "teniu canvis «staged» en el vostre arbre de treball\n" -"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n" +"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, " +"executeu:\n" "\n" " git commit --amend %s\n" "\n" @@ -2824,17 +3050,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:688 +#: sequencer.c:694 #, c-format msgid "could not parse commit %s\n" msgstr "no s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:693 +#: sequencer.c:699 #, c-format msgid "could not parse parent commit %s\n" -msgstr "no s'ha pogut analitzar la comissió mare %s\n" +msgstr "no s'ha pogut analitzar la comissió pare %s\n" -#: sequencer.c:815 +#: sequencer.c:821 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2845,7 +3071,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:821 +#: sequencer.c:827 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2856,230 +3082,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 sequencer.c:852 +#: sequencer.c:833 sequencer.c:858 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:836 +#: sequencer.c:842 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:838 +#: sequencer.c:844 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:840 +#: sequencer.c:846 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:846 +#: sequencer.c:852 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure '%s'" -#: sequencer.c:855 git-rebase--interactive.sh:445 +#: sequencer.c:861 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:863 +#: sequencer.c:869 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:870 +#: sequencer.c:876 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:875 +#: sequencer.c:881 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà:" -#: sequencer.c:880 +#: sequencer.c:886 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:946 +#: sequencer.c:952 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:964 +#: sequencer.c:970 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:972 +#: sequencer.c:978 #, c-format msgid "commit %s does not have parent %d" -msgstr "la comissió %s no té mare %d" +msgstr "la comissió %s no té pare %d" -#: sequencer.c:976 +#: sequencer.c:982 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "s'ha especificat la línia principal però la comissió %s no és una fusió." -#: sequencer.c:982 +#: sequencer.c:988 #, c-format msgid "cannot get commit message for %s" msgstr "no es pot obtenir el missatge de comissió de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1001 +#: sequencer.c:1009 #, c-format msgid "%s: cannot parse parent commit %s" -msgstr "%s: no es pot analitzar la comissió mare %s" +msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1063 sequencer.c:1812 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom '%s' a '%s'" -#: sequencer.c:1114 +#: sequencer.c:1122 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:1115 +#: sequencer.c:1123 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:1157 +#: sequencer.c:1165 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:1167 +#: sequencer.c:1175 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha produït un error en llegir l'índex" -#: sequencer.c:1174 +#: sequencer.c:1182 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'índex" -#: sequencer.c:1294 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:1302 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "No es pot '%s' sense una comissió prèvia" -#: sequencer.c:1334 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir '%s'." -#: sequencer.c:1341 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'." -#: sequencer.c:1343 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: '%s'" -#: sequencer.c:1348 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:1359 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:1361 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:1424 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "clau no vàlida: %s" -#: sequencer.c:1427 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:1484 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: '%s'" -#: sequencer.c:1522 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:1523 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1526 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador '%s'" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:1596 sequencer.c:2150 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:1598 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:1600 sequencer.c:1634 +#: sequencer.c:1615 sequencer.c:1649 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:1620 builtin/grep.c:904 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir '%s'" -#: sequencer.c:1622 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir '%s': %s" -#: sequencer.c:1623 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:1629 +#: sequencer.c:1644 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» '%s' és malmès" -#: sequencer.c:1640 +#: sequencer.c:1655 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" -#: sequencer.c:1777 sequencer.c:2049 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "No es pot llegir HEAD" -#: sequencer.c:1817 builtin/difftool.c:574 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar '%s' a '%s'" -#: sequencer.c:1833 +#: sequencer.c:1848 msgid "could not read index" msgstr "no s'ha pogut llegir l'índex" -#: sequencer.c:1838 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3094,11 +3320,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1844 +#: sequencer.c:1859 msgid "and made changes to the index and/or the working tree\n" msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n" -#: sequencer.c:1850 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3114,17 +3340,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1905 git-rebase.sh:168 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "S'ha aplicat el magatzem automàtic." -#: sequencer.c:1917 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:1919 git-rebase.sh:172 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3135,57 +3361,57 @@ msgstr "" "Els vostres canvis estan segurs en el magatzem.\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" -#: sequencer.c:2000 +#: sequencer.c:2016 #, c-format -msgid "stopped at %s... %.*s" -msgstr "aturat a %s... %.*s" +msgid "Stopped at %s... %.*s\n" +msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:2027 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:2057 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "No s'ha pogut llegir orig-head" -#: sequencer.c:2061 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir 'onto'" -#: sequencer.c:2068 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "no s'ha pogut analitzar %s" -#: sequencer.c:2075 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:2159 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot rebasar: Teniu canvis «unstaged»." -#: sequencer.c:2164 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:2173 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:2175 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vàlid: '%s'" -#: sequencer.c:2177 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vàlid: '%s'" -#: sequencer.c:2180 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3195,25 +3421,25 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n" "primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: sequencer.c:2190 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "No s'ha pogut cometre els canvis «staged»." -#: sequencer.c:2270 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:2274 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:2307 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: setup.c:160 +#: setup.c:165 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3223,7 +3449,7 @@ msgstr "" "Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin " "localment." -#: setup.c:173 +#: setup.c:178 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3234,7 +3460,7 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:223 +#: setup.c:228 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3245,29 +3471,34 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:470 +#: setup.c:475 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:478 +#: setup.c:483 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:768 +#: setup.c:776 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 +#: setup.c:778 builtin/index-pack.c:1646 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: setup.c:852 +#: setup.c:1010 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:927 +#: setup.c:1022 setup.c:1028 +#, c-format +msgid "Cannot change to '%s'" +msgstr "No es pot canviar a '%s'" + +#: setup.c:1041 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3277,12 +3508,7 @@ msgstr "" "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "no està establert)." -#: setup.c:934 -#, c-format -msgid "Cannot change to '%s/..'" -msgstr "No es pot canviar a '%s/..'" - -#: setup.c:996 +#: setup.c:1106 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3293,58 +3519,58 @@ msgstr "" "El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: sha1_file.c:490 +#: sha1_file.c:559 #, c-format msgid "path '%s' does not exist" msgstr "el camí '%s' no existeix" -#: sha1_file.c:516 +#: sha1_file.c:585 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat." -#: sha1_file.c:522 +#: sha1_file.c:591 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència '%s' no és un dipòsit local." -#: sha1_file.c:528 +#: sha1_file.c:597 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència '%s' és superficial" -#: sha1_file.c:536 +#: sha1_file.c:605 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència '%s' és empeltat" -#: sha1_file.c:1176 +#: sha1_file.c:1245 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: sha1_file.c:2637 +#: sha1_file.c:2721 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" -#: sha1_file.c:2641 +#: sha1_file.c:2725 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)" -#: sha1_name.c:407 +#: sha1_name.c:409 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt és ambigu" -#: sha1_name.c:418 +#: sha1_name.c:420 msgid "The candidates are:" msgstr "Els candidats són:" -#: sha1_name.c:578 +#: sha1_name.c:580 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3368,64 +3594,75 @@ msgstr "" "suprimiu-les. Desactiveu aquest missatge executant\n" "\"git config advice.objectNameWarning false\"" -#: submodule.c:65 submodule.c:99 +#: submodule.c:67 submodule.c:101 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes " "de fusió" -#: submodule.c:69 submodule.c:103 +#: submodule.c:71 submodule.c:105 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s" -#: submodule.c:77 +#: submodule.c:79 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" -#: submodule.c:110 +#: submodule.c:112 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" -#: submodule.c:121 +#: submodule.c:123 msgid "staging updated .gitmodules failed" msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:159 +#: submodule.c:161 msgid "negative values not allowed for submodule.fetchJobs" msgstr "no es permeten els valors negatius a submodule.fetchJobs" -#: submodule.c:1184 +#: submodule.c:1194 +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "'%s' no reconegut com un dipòsit git" + +#: submodule.c:1332 #, c-format -msgid "could not start 'git status in submodule '%s'" -msgstr "no s'ha pogut iniciar 'git status in submodule '%s'" +msgid "could not start 'git status' in submodule '%s'" +msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'" -#: submodule.c:1197 +#: submodule.c:1345 #, c-format -msgid "could not run 'git status in submodule '%s'" -msgstr "no s'ha pogut executar 'git status in submodule '%s'" +msgid "could not run 'git status' in submodule '%s'" +msgstr "no s'ha pogut executar 'git status' al submòdul '%s'" -#: submodule.c:1398 +#: submodule.c:1421 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "el submòdul '%s' té l'índex brut" + +#: submodule.c:1678 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de treball" +"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de " +"treball" -#: submodule.c:1410 submodule.c:1471 +#: submodule.c:1690 submodule.c:1746 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submòdul '%s'" -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 -#: builtin/submodule--helper.c:650 +#: submodule.c:1694 builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori '%s'" -#: submodule.c:1420 +#: submodule.c:1697 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3436,12 +3673,25 @@ msgstr "" "'%s' a\n" "'%s'\n" -#: submodule.c:1512 +#: submodule.c:1781 #, c-format msgid "could not recurse into submodule '%s'" -msgstr "S'ha produït un error en cercar recursivament al camí de submòdul '%s'" +msgstr "s'ha produït un error en cercar recursivament al camí de submòdul '%s'" -#: submodule-config.c:360 +#: submodule.c:1825 +msgid "could not start ls-files in .." +msgstr "no s'ha pogut iniciar ls-files a .." + +#: submodule.c:1845 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?" + +#: submodule.c:1864 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree ha retornat un codi de retorn %d no esperat" + +#: submodule-config.c:380 #, c-format msgid "invalid value for %s" msgstr "valor no vàlid per a %s" @@ -3510,7 +3760,7 @@ msgstr "Canviaria la font de '%s' a '%s' de '%s'\n" msgid "transport: invalid depth option '%s'" msgstr "transport: opció de profunditat no vàlida '%s'" -#: transport.c:885 +#: transport.c:889 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3519,7 +3769,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:889 +#: transport.c:893 #, c-format msgid "" "\n" @@ -3545,11 +3795,11 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:897 +#: transport.c:901 msgid "Aborting." msgstr "S'està avortant." -#: transport-helper.c:1082 +#: transport-helper.c:1080 #, c-format msgid "Could not read ref %s" msgstr "No s'ha pogut llegir la referència %s" @@ -3570,7 +3820,7 @@ msgstr "nom de fitxer buit en una entrada d'arbre" msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:99 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3581,7 +3831,7 @@ msgstr "" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " "canviar de branca." -#: unpack-trees.c:101 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3591,7 +3841,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:104 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3602,7 +3852,7 @@ msgstr "" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " "fusionar." -#: unpack-trees.c:106 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3612,7 +3862,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3621,7 +3871,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s." -#: unpack-trees.c:111 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3630,7 +3880,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:121 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3639,7 +3889,7 @@ msgstr "" "En actualitzar els directoris següents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:120 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3649,7 +3899,7 @@ msgstr "" "agafar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:122 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3659,7 +3909,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3669,7 +3919,7 @@ msgstr "" "fusionar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:127 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3679,7 +3929,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3688,7 +3938,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: unpack-trees.c:132 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3697,7 +3947,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3708,7 +3958,7 @@ msgstr "" "agafar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:139 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3719,7 +3969,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3729,7 +3979,7 @@ msgstr "" "fusionar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:144 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3739,7 +3989,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3749,7 +3999,7 @@ msgstr "" "%s:\n" "%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: unpack-trees.c:149 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3759,12 +4009,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:161 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular." -#: unpack-trees.c:159 +#: unpack-trees.c:164 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3774,7 +4024,7 @@ msgstr "" "dia:\n" "%s" -#: unpack-trees.c:161 +#: unpack-trees.c:166 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3785,7 +4035,7 @@ msgstr "" "actualitzar l'agafament parcial:\n" "%s" -#: unpack-trees.c:163 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3796,45 +4046,59 @@ msgstr "" "l'agafament parcial:\n" "%s" -#: unpack-trees.c:240 +#: unpack-trees.c:170 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"No es pot actualitzar el submòdul:\n" +"%s" + +#: unpack-trees.c:247 #, c-format msgid "Aborting\n" msgstr "S'està avortant\n" -#: unpack-trees.c:270 +#: unpack-trees.c:272 +#, c-format +msgid "submodule update strategy not supported for submodule '%s'" +msgstr "el submòdul'%s' té una estratègia d'actualització no admesa" + +#: unpack-trees.c:340 msgid "Checking out files" msgstr "S'estan agafant fitxers" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "seqüència d'escapament %XX no vàlida" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "manca la màquina i l'esquema no és 'file:'" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "un URL 'file:' no pot tenir número de port" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "hi ha caràcters no vàlids en el nom de màquina" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "número de port no vàlid" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "segment de camí '..' no vàlid" -#: worktree.c:282 +#: worktree.c:285 #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir '%s'" @@ -3849,28 +4113,28 @@ msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura" msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir '%s' per a escriptura" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir '%s' per a lectura" -#: wrapper.c:605 wrapper.c:626 +#: wrapper.c:581 wrapper.c:602 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a '%s'" -#: wrapper.c:634 +#: wrapper.c:610 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" -#: wrapper.c:658 +#: wrapper.c:634 #, c-format msgid "could not write to %s" msgstr "no s'ha pogut escriure a %s" -#: wrapper.c:660 +#: wrapper.c:636 #, c-format msgid "could not close %s" msgstr "no s'ha pogut tancar %s" @@ -3902,11 +4166,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:199 wt-status.c:945 +#: wt-status.c:199 wt-status.c:958 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:217 wt-status.c:954 +#: wt-status.c:217 wt-status.c:967 msgid "Changes not staged for commit:" msgstr "Canvis no «stage» per a cometre:" @@ -3933,7 +4197,7 @@ msgstr "" #: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)" +msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en el què es cometrà)" #: wt-status.c:253 msgid "both deleted:" @@ -4007,15 +4271,15 @@ msgstr "contingut modificat, " msgid "untracked content, " msgstr "contingut no seguit, " -#: wt-status.c:818 +#: wt-status.c:831 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:820 +#: wt-status.c:833 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:901 +#: wt-status.c:914 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4023,237 +4287,237 @@ msgstr "" "No toqueu la línia a dalt.\n" "Tot el que hi ha a sota s'eliminarà." -#: wt-status.c:1013 +#: wt-status.c:1026 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:1016 +#: wt-status.c:1029 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:1018 +#: wt-status.c:1031 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (useu \"git merge --abort\" per a avortar la fusió)" -#: wt-status.c:1023 +#: wt-status.c:1036 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:1026 +#: wt-status.c:1039 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:1036 +#: wt-status.c:1049 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:1039 +#: wt-status.c:1052 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:1043 +#: wt-status.c:1056 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:1045 +#: wt-status.c:1058 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1047 +#: wt-status.c:1060 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1176 +#: wt-status.c:1189 msgid "git-rebase-todo is missing." msgstr "Manca git-rebase-todo." -#: wt-status.c:1178 +#: wt-status.c:1191 msgid "No commands done." msgstr "No s'ha fet cap ordre." -#: wt-status.c:1181 +#: wt-status.c:1194 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Última ordre feta (%d ordre feta):" msgstr[1] "Últimes ordres fetes (%d ordres fetes):" -#: wt-status.c:1192 +#: wt-status.c:1205 #, c-format msgid " (see more in file %s)" msgstr " (vegeu més en el fitxer %s)" -#: wt-status.c:1197 +#: wt-status.c:1210 msgid "No commands remaining." msgstr "No manca cap ordre." -#: wt-status.c:1200 +#: wt-status.c:1213 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Ordre següent a fer (manca %d ordre):" msgstr[1] "Ordres següents a fer (manquen %d ordres):" -#: wt-status.c:1208 +#: wt-status.c:1221 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" -#: wt-status.c:1221 +#: wt-status.c:1234 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: wt-status.c:1226 +#: wt-status.c:1239 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1240 +#: wt-status.c:1253 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1242 +#: wt-status.c:1255 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1244 +#: wt-status.c:1257 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1250 +#: wt-status.c:1263 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1254 +#: wt-status.c:1267 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1259 +#: wt-status.c:1272 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant un rebasament." -#: wt-status.c:1262 +#: wt-status.c:1275 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vegada que el vostre directori de treball sigui net, executeu \"git " "rebase --continue\")" -#: wt-status.c:1266 +#: wt-status.c:1279 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissió mentre es fa «rebase» de la branca " "'%s' en '%s'." -#: wt-status.c:1271 +#: wt-status.c:1284 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant un «rebase»." -#: wt-status.c:1274 +#: wt-status.c:1287 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1276 +#: wt-status.c:1289 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els " "vostres canvis)" -#: wt-status.c:1286 +#: wt-status.c:1299 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu fent «cherry pick» a la comissió %s." -#: wt-status.c:1291 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1294 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" "\")" -#: wt-status.c:1296 +#: wt-status.c:1309 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry " "pick»)" -#: wt-status.c:1305 +#: wt-status.c:1318 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1310 +#: wt-status.c:1323 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1313 +#: wt-status.c:1326 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1315 +#: wt-status.c:1328 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1326 +#: wt-status.c:1339 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1330 +#: wt-status.c:1343 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1333 +#: wt-status.c:1346 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1530 +#: wt-status.c:1543 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1536 +#: wt-status.c:1549 msgid "interactive rebase in progress; onto " msgstr "«rebase» interactiu en progrés; sobre " -#: wt-status.c:1538 +#: wt-status.c:1551 msgid "rebase in progress; onto " msgstr "«rebase» en progrés; sobre " -#: wt-status.c:1543 +#: wt-status.c:1556 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1545 +#: wt-status.c:1558 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1548 +#: wt-status.c:1561 msgid "Not currently on any branch." msgstr "Actualment no s'és en cap branca." -#: wt-status.c:1566 +#: wt-status.c:1579 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1580 +#: wt-status.c:1593 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1582 +#: wt-status.c:1595 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1586 +#: wt-status.c:1599 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4265,103 +4529,99 @@ msgstr "" "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" "'git help status')." -#: wt-status.c:1592 +#: wt-status.c:1605 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1594 +#: wt-status.c:1607 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1600 +#: wt-status.c:1613 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1605 +#: wt-status.c:1618 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1608 +#: wt-status.c:1621 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1611 +#: wt-status.c:1624 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " -"\"git add\" per a seguir-los)\n" +"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git " +"add\" per a seguir-los)\n" -#: wt-status.c:1614 +#: wt-status.c:1627 #, c-format msgid "nothing added to commit but untracked files present\n" -msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" +msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n" -#: wt-status.c:1617 +#: wt-status.c:1630 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1620 wt-status.c:1625 +#: wt-status.c:1633 wt-status.c:1638 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1623 +#: wt-status.c:1636 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1627 +#: wt-status.c:1640 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: wt-status.c:1734 +#: wt-status.c:1749 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1738 +#: wt-status.c:1753 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1767 -msgid "gone" -msgstr "no hi és" - -#: wt-status.c:1769 wt-status.c:1777 +#: wt-status.c:1782 wt-status.c:1790 msgid "behind " msgstr "darrere " -#: wt-status.c:1772 wt-status.c:1775 +#: wt-status.c:1785 wt-status.c:1788 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2277 +#: wt-status.c:2280 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no es pot %s: Teniu canvis «unstaged»." -#: wt-status.c:2283 +#: wt-status.c:2286 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre índex conté canvis sense cometre." -#: wt-status.c:2285 +#: wt-status.c:2288 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." -#: compat/precompose_utf8.c:57 builtin/clone.c:414 +#: compat/precompose_utf8.c:57 builtin/clone.c:432 #, c-format msgid "failed to unlink '%s'" msgstr "s'ha produït un error en desenllaçar '%s'" @@ -4388,7 +4648,7 @@ msgstr "elimina '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:209 builtin/rev-parse.c:845 +#: builtin/add.c:209 builtin/rev-parse.c:872 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" @@ -4424,9 +4684,9 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 msgid "dry run" msgstr "marxa en sec" @@ -4434,7 +4694,7 @@ msgstr "marxa en sec" msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" @@ -4476,11 +4736,11 @@ msgid "check if - even missing - files are ignored in dry run" msgstr "" "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" -#: builtin/add.c:283 builtin/update-index.c:947 +#: builtin/add.c:283 builtin/update-index.c:951 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:948 +#: builtin/add.c:283 builtin/update-index.c:952 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" @@ -4516,117 +4776,117 @@ msgstr "No s'ha especificat res, no s'ha afegit res.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volíeu dir 'git add .'?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: builtin/am.c:414 +#: builtin/am.c:412 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: '%s'." -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "S'ha produït un error en copiar les notes de '%s' a '%s'" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç '%s'" -#: builtin/am.c:840 +#: builtin/am.c:842 msgid "Only one StGIT patch series can be applied at once" msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada" -#: builtin/am.c:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "desplaçament de zona de temps no vàlid" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:989 builtin/clone.c:379 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori '%s'" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1127 builtin/commit.c:376 msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'índex" -#: builtin/am.c:1176 +#: builtin/am.c:1178 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/am.c:1177 +#: builtin/am.c:1179 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." -#: builtin/am.c:1178 +#: builtin/am.c:1180 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort" "\"." -#: builtin/am.c:1316 +#: builtin/am.c:1315 msgid "Patch is empty. Was it split wrong?" msgstr "El pedaç és buit. S'ha dividit malament?" -#: builtin/am.c:1390 builtin/log.c:1550 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" -#: builtin/am.c:1417 +#: builtin/am.c:1413 #, c-format msgid "unable to parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: builtin/am.c:1610 +#: builtin/am.c:1606 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " "vies." -#: builtin/am.c:1612 +#: builtin/am.c:1608 msgid "Using index info to reconstruct a base tree..." msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..." -#: builtin/am.c:1631 +#: builtin/am.c:1627 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4634,38 +4894,38 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1637 +#: builtin/am.c:1633 msgid "Falling back to patching base and 3-way merge..." msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..." -#: builtin/am.c:1662 +#: builtin/am.c:1658 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1686 builtin/merge.c:632 +#: builtin/am.c:1682 builtin/merge.c:631 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/am.c:1693 +#: builtin/am.c:1689 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 #: builtin/merge.c:827 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1759 +#: builtin/am.c:1755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "no es pot ser interactiu sense que stdin estigui connectada a un terminal." -#: builtin/am.c:1764 +#: builtin/am.c:1760 msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -4673,37 +4933,37 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1770 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls " "tots: " -#: builtin/am.c:1824 +#: builtin/am.c:1820 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1876 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1885 +#: builtin/am.c:1884 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1890 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La còpia del pedaç que ha fallat es troba en: %s" -#: builtin/am.c:1936 +#: builtin/am.c:1935 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4713,7 +4973,7 @@ msgstr "" "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/am.c:1943 +#: builtin/am.c:1942 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -4721,17 +4981,17 @@ msgstr "" "Encara teniu camins sense fusionar en el vostre índex.\n" "Heu oblidat d'usar 'git add'?" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte '%s'." -#: builtin/am.c:2103 +#: builtin/am.c:2102 msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'índex" -#: builtin/am.c:2137 +#: builtin/am.c:2136 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4739,135 +4999,135 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" "No s'està rebobinant a ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no vàlid per a --patch-format: %s" -#: builtin/am.c:2233 +#: builtin/am.c:2232 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opcions>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2242 +#: builtin/am.c:2241 msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:178 msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2247 +#: builtin/am.c:2246 msgid "add a Signed-off-by line to the commit message" msgstr "afegeix una línia Signed-off-by al missatge de comissió" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2252 +#: builtin/am.c:2251 msgid "pass -k flag to git-mailinfo" msgstr "passa la bandera -k al git-mailinfo" -#: builtin/am.c:2254 +#: builtin/am.c:2253 msgid "pass -b flag to git-mailinfo" msgstr "passa la bandera -b al git-mailinfo" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "pass -m flag to git-mailinfo" msgstr "passa la bandera -m al git-mailinfo" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox" -#: builtin/am.c:2261 +#: builtin/am.c:2260 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 +#: builtin/am.c:2292 msgid "pass it through git-apply" msgstr "passa-ho a través del git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:387 builtin/verify-tag.c:38 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2290 +#: builtin/am.c:2289 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "override error message when patch failure occurs" msgstr "" "passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar" -#: builtin/am.c:2298 +#: builtin/am.c:2297 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "restore the original branch and abort the patching operation." msgstr "restaura la branca original i avorta l'operació d'apedaçament." -#: builtin/am.c:2311 +#: builtin/am.c:2310 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2316 +#: builtin/am.c:2315 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "(internal use for git-rebase)" msgstr "(ús intern per al git-rebase)" -#: builtin/am.c:2334 +#: builtin/am.c:2333 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." @@ -4875,18 +5135,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà. Si us plau, no l'useu més." -#: builtin/am.c:2341 +#: builtin/am.c:2340 msgid "failed to read the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/am.c:2356 +#: builtin/am.c:2355 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "un directori de rebasament anterior %s encara existeix però s'ha donat una " "bústia." -#: builtin/am.c:2380 +#: builtin/am.c:2379 #, c-format msgid "" "Stray %s directory found.\n" @@ -4895,7 +5155,7 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: builtin/am.c:2386 +#: builtin/am.c:2385 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." @@ -4925,11 +5185,6 @@ msgstr "git archive: ACK/NAK esperat, EOF rebut" msgid "git archive: NACK %s" msgstr "git archive: %s NACK" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "error remot: %s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive: error de protocol" @@ -4958,117 +5213,117 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:1786 +#: builtin/blame.c:1777 msgid "Blaming lines" msgstr "S'està fent un «blame»" -#: builtin/blame.c:2582 +#: builtin/blame.c:2573 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:2583 +#: builtin/blame.c:2574 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2575 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2576 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:2586 +#: builtin/blame.c:2577 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:2587 +#: builtin/blame.c:2578 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:2588 +#: builtin/blame.c:2579 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2580 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2581 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:2591 +#: builtin/blame.c:2582 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:2592 +#: builtin/blame.c:2583 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:2593 +#: builtin/blame.c:2584 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:2594 +#: builtin/blame.c:2585 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:2595 +#: builtin/blame.c:2586 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:2596 +#: builtin/blame.c:2587 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " "defecte: desactivat)" -#: builtin/blame.c:2597 +#: builtin/blame.c:2588 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:2604 +#: builtin/blame.c:2595 msgid "Use an experimental heuristic to improve diffs" msgstr "Usa un heurístic experimental per a millorar les diferències" -#: builtin/blame.c:2606 +#: builtin/blame.c:2597 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:2607 +#: builtin/blame.c:2598 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:2608 +#: builtin/blame.c:2599 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:2609 builtin/blame.c:2610 +#: builtin/blame.c:2600 builtin/blame.c:2601 msgid "score" msgstr "puntuació" -#: builtin/blame.c:2609 +#: builtin/blame.c:2600 msgid "Find line copies within and across files" msgstr "Troba còpies de línia dins i a través dels fitxers" -#: builtin/blame.c:2610 +#: builtin/blame.c:2601 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:2611 +#: builtin/blame.c:2602 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2611 +#: builtin/blame.c:2602 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de línies n,m, comptant des d'1" -#: builtin/blame.c:2658 +#: builtin/blame.c:2649 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -5079,42 +5334,42 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2706 +#: builtin/blame.c:2697 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:2786 +#: builtin/blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -#: builtin/blame.c:2806 +#: builtin/blame.c:2797 msgid "cannot use --contents with final commit object name" msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" -#: builtin/blame.c:2811 +#: builtin/blame.c:2802 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent-together requereixen una última comissió " "especificada" -#: builtin/blame.c:2838 +#: builtin/blame.c:2829 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent junts requereixen un rang de la cadena de mares " "primeres" -#: builtin/blame.c:2849 +#: builtin/blame.c:2840 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: builtin/blame.c:2860 +#: builtin/blame.c:2851 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" -#: builtin/blame.c:2879 +#: builtin/blame.c:2870 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -5141,7 +5396,11 @@ msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>" msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<opcions>] [-r | -a] [--points-at]" -#: builtin/branch.c:143 +#: builtin/branch.c:31 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<opcions>] [-r | -a] [--format]" + +#: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5151,7 +5410,7 @@ msgstr "" " fusionat a '%s', però encara no\n" " s'ha fusionat a HEAD." -#: builtin/branch.c:147 +#: builtin/branch.c:148 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5161,12 +5420,12 @@ msgstr "" " s'ha fusionat a '%s', encara que està\n" " fusionada a HEAD." -#: builtin/branch.c:161 +#: builtin/branch.c:162 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'" -#: builtin/branch.c:165 +#: builtin/branch.c:166 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5175,165 +5434,93 @@ msgstr "" "La branca '%s' no està totalment fusionada.\n" "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'." -#: builtin/branch.c:178 +#: builtin/branch.c:179 msgid "Update of config-file failed" msgstr "L'actualització del fitxer de configuració ha fallat" -#: builtin/branch.c:206 +#: builtin/branch.c:210 msgid "cannot use -a with -d" msgstr "no es pot usar -a amb -d" -#: builtin/branch.c:212 +#: builtin/branch.c:216 msgid "Couldn't look up commit object for HEAD" msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" -#: builtin/branch.c:226 +#: builtin/branch.c:230 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No es pot suprimir la branca '%s' agafada a '%s'" -#: builtin/branch.c:241 +#: builtin/branch.c:245 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "no s'ha trobat la branca amb seguiment remot '%s'." -#: builtin/branch.c:242 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "no s'ha trobat la branca '%s'." -#: builtin/branch.c:257 +#: builtin/branch.c:261 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Error en suprimir la branca amb seguiment remot '%s'" -#: builtin/branch.c:258 +#: builtin/branch.c:262 #, c-format msgid "Error deleting branch '%s'" msgstr "Error en suprimir la branca '%s'" -#: builtin/branch.c:265 +#: builtin/branch.c:269 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n" -#: builtin/branch.c:266 +#: builtin/branch.c:270 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "S'ha suprimit la branca %s (era %s).\n" -#: builtin/branch.c:312 -#, c-format -msgid "[%s: gone]" -msgstr "[%s: no hi és]" - -#: builtin/branch.c:317 -#, c-format -msgid "[%s]" -msgstr "[%s]" - -#: builtin/branch.c:322 -#, c-format -msgid "[%s: behind %d]" -msgstr "[%s: darrere per %d]" - -#: builtin/branch.c:324 -#, c-format -msgid "[behind %d]" -msgstr "[darrere de %d]" - -#: builtin/branch.c:328 -#, c-format -msgid "[%s: ahead %d]" -msgstr "[%s: davant per %d]" - -#: builtin/branch.c:330 -#, c-format -msgid "[ahead %d]" -msgstr "[davant de %d]" - -#: builtin/branch.c:333 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "[%s: davant per %d, darrere per %d]" - -#: builtin/branch.c:336 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "[davant %d, darrere %d]" - -#: builtin/branch.c:349 -msgid " **** invalid ref ****" -msgstr " **** referència no vàlida ****" - -#: builtin/branch.c:375 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(cap branca, s'està rebasant %s)" - -#: builtin/branch.c:378 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(cap branca, bisecció començada en %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: builtin/branch.c:384 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD separat a %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: builtin/branch.c:389 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD separat de %s)" - -#: builtin/branch.c:393 -msgid "(no branch)" -msgstr "(cap branca)" - -#: builtin/branch.c:535 +#: builtin/branch.c:441 #, c-format msgid "Branch %s is being rebased at %s" msgstr "S'està fent «rebase» en la branca %s a %s" -#: builtin/branch.c:539 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branca %s s'està bisecant a %s" -#: builtin/branch.c:554 +#: builtin/branch.c:460 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:564 +#: builtin/branch.c:470 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no vàlid: '%s'" -#: builtin/branch.c:581 +#: builtin/branch.c:487 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:585 +#: builtin/branch.c:490 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la branca mal anomenada '%s'" -#: builtin/branch.c:588 +#: builtin/branch.c:493 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:595 +#: builtin/branch.c:502 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branca està canviada de nom, però l'actualització del fitxer de " "configuració ha fallat" -#: builtin/branch.c:611 +#: builtin/branch.c:518 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5344,207 +5531,216 @@ msgstr "" " %s\n" "S'eliminaran les línies que comencin amb '%c'.\n" -#: builtin/branch.c:643 +#: builtin/branch.c:551 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:645 +#: builtin/branch.c:553 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font" -#: builtin/branch.c:646 +#: builtin/branch.c:554 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:647 +#: builtin/branch.c:555 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:649 +#: builtin/branch.c:557 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:651 +#: builtin/branch.c:559 msgid "upstream" msgstr "font" -#: builtin/branch.c:651 +#: builtin/branch.c:559 msgid "change the upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:652 +#: builtin/branch.c:560 msgid "Unset the upstream info" msgstr "Desestableix la informació de font" -#: builtin/branch.c:653 +#: builtin/branch.c:561 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:654 +#: builtin/branch.c:562 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:656 builtin/branch.c:657 +#: builtin/branch.c:564 builtin/branch.c:566 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:660 +#: builtin/branch.c:565 builtin/branch.c:567 +msgid "print only branches that don't contain the commit" +msgstr "imprimeix només les branques que no continguin la comissió" + +#: builtin/branch.c:570 msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:661 +#: builtin/branch.c:571 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:663 +#: builtin/branch.c:573 msgid "delete fully merged branch" msgstr "suprimeix la branca si està completament fusionada" -#: builtin/branch.c:664 +#: builtin/branch.c:574 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:665 +#: builtin/branch.c:575 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:666 +#: builtin/branch.c:576 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destí existeixi" -#: builtin/branch.c:667 +#: builtin/branch.c:577 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:668 +#: builtin/branch.c:578 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:670 +#: builtin/branch.c:580 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:671 +#: builtin/branch.c:581 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:672 +#: builtin/branch.c:582 msgid "print only branches that are merged" msgstr "imprimeix només les branques que s'han fusionat" -#: builtin/branch.c:673 +#: builtin/branch.c:583 msgid "print only branches that are not merged" msgstr "imprimeix només les branques que no s'han fusionat" -#: builtin/branch.c:674 +#: builtin/branch.c:584 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 msgid "key" msgstr "clau" -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:384 +#: builtin/tag.c:429 msgid "object" msgstr "objecte" -#: builtin/branch.c:679 +#: builtin/branch.c:589 msgid "print only branches of the object" msgstr "imprimeix només les branques de l'objecte" -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" -#: builtin/branch.c:698 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 +#: builtin/verify-tag.c:38 +msgid "format to use for the output" +msgstr "format a usar en la sortida" + +#: builtin/branch.c:611 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:702 builtin/clone.c:706 +#: builtin/branch.c:615 builtin/clone.c:724 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:724 +#: builtin/branch.c:638 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:735 builtin/branch.c:787 +#: builtin/branch.c:649 builtin/branch.c:701 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:763 +#: builtin/branch.c:677 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:768 +#: builtin/branch.c:682 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:775 +#: builtin/branch.c:689 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha cap comissió en la branca '%s'." -#: builtin/branch.c:778 +#: builtin/branch.c:692 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:793 +#: builtin/branch.c:707 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:798 +#: builtin/branch.c:712 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:802 +#: builtin/branch.c:716 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:809 +#: builtin/branch.c:723 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:821 +#: builtin/branch.c:735 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:825 +#: builtin/branch.c:739 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." -#: builtin/branch.c:831 +#: builtin/branch.c:745 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:845 +#: builtin/branch.c:759 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:851 +#: builtin/branch.c:765 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" -#: builtin/branch.c:854 +#: builtin/branch.c:768 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5553,7 +5749,7 @@ msgstr "" "La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --" "track o --set-upstream-to\n" -#: builtin/branch.c:871 +#: builtin/branch.c:785 #, c-format msgid "" "\n" @@ -5564,16 +5760,16 @@ msgstr "" "Si volíeu fer '%s' seguir '%s', feu això:\n" "\n" -#: builtin/bundle.c:51 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s està bé\n" -#: builtin/bundle.c:64 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "Cal un dipòsit per a fer un farcell." -#: builtin/bundle.c:68 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." @@ -5622,7 +5818,7 @@ msgid "for blob objects, run filters on object's content" msgstr "" "en els objectes de blob, executa els filtres en el contingut de l'objecte" -#: builtin/cat-file.c:561 git-submodule.sh:929 +#: builtin/cat-file.c:561 git-submodule.sh:943 msgid "blob" msgstr "blob" @@ -5680,7 +5876,7 @@ msgstr "llegeix els noms de fitxer d'stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -5771,9 +5967,9 @@ msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 -#: builtin/worktree.c:471 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 +#: builtin/worktree.c:477 msgid "string" msgstr "cadena" @@ -5785,114 +5981,114 @@ msgstr "en crear fitxers, anteposa <cadena>" msgid "copy out the files from named stage" msgstr "copia els fitxers des de «stage» amb nom" -#: builtin/checkout.c:25 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opcions>] <branca>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:153 builtin/checkout.c:186 #, c-format msgid "path '%s' does not have our version" msgstr "el camí '%s' no té la nostra versió" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:155 builtin/checkout.c:188 #, c-format msgid "path '%s' does not have their version" msgstr "el camí '%s' no té la seva versió" -#: builtin/checkout.c:152 +#: builtin/checkout.c:171 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camí '%s' no té totes les versions necessàries" -#: builtin/checkout.c:196 +#: builtin/checkout.c:215 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí '%s' no té les versions necessàries" -#: builtin/checkout.c:213 +#: builtin/checkout.c:232 #, c-format msgid "path '%s': cannot merge" msgstr "camí '%s': no es pot fusionar" -#: builtin/checkout.c:230 +#: builtin/checkout.c:249 #, c-format msgid "Unable to add merge result for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no es pot usar amb actualització de camins" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:281 builtin/checkout.c:284 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no es pot usar amb %s" -#: builtin/checkout.c:268 +#: builtin/checkout.c:287 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada." -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:358 builtin/checkout.c:365 #, c-format msgid "path '%s' is unmerged" msgstr "el camí '%s' està sense fusionar" -#: builtin/checkout.c:494 +#: builtin/checkout.c:513 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:625 +#: builtin/checkout.c:644 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer reflog per a '%s': %s\n" -#: builtin/checkout.c:666 +#: builtin/checkout.c:685 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:670 builtin/clone.c:660 +#: builtin/checkout.c:689 builtin/clone.c:678 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:674 +#: builtin/checkout.c:693 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca '%s'\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:696 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:681 +#: builtin/checkout.c:700 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca '%s'\n" -#: builtin/checkout.c:683 builtin/checkout.c:1072 +#: builtin/checkout.c:702 builtin/checkout.c:1090 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova '%s'\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:704 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca '%s'\n" -#: builtin/checkout.c:736 +#: builtin/checkout.c:755 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:742 +#: builtin/checkout.c:761 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5915,7 +6111,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:780 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5942,150 +6138,150 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:797 +#: builtin/checkout.c:816 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:801 +#: builtin/checkout.c:820 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:828 builtin/checkout.c:1067 +#: builtin/checkout.c:847 builtin/checkout.c:1085 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:973 +#: builtin/checkout.c:991 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1013 builtin/worktree.c:214 +#: builtin/checkout.c:1031 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1060 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1099 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1084 builtin/checkout.c:1088 +#: builtin/checkout.c:1102 builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no es pot usar amb canvi de branca" -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 +#: builtin/checkout.c:1121 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1126 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a la no comissió '%s'" -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 -#: builtin/worktree.c:326 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1160 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1162 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1163 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1146 builtin/worktree.c:328 +#: builtin/checkout.c:1164 builtin/worktree.c:333 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1165 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1167 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1167 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1168 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1170 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1172 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1173 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1156 builtin/merge.c:235 +#: builtin/checkout.c:1174 builtin/merge.c:234 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 msgid "style" msgstr "estil" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1176 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1179 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 msgid "second guess 'git checkout <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1183 msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:168 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 +#: builtin/send-pack.c:172 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1224 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1241 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1246 msgid "Missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1282 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1289 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -6094,12 +6290,12 @@ msgstr "" "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n" "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1294 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'" -#: builtin/checkout.c:1271 +#: builtin/checkout.c:1298 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6138,7 +6334,7 @@ msgstr "Ometria el dipòsit %s\n" msgid "failed to remove %s" msgstr "s'ha produït un error en eliminar %s" -#: builtin/clean.c:291 git-add--interactive.perl:623 +#: builtin/clean.c:297 git-add--interactive.perl:614 #, c-format msgid "" "Prompt help:\n" @@ -6151,7 +6347,7 @@ msgstr "" "foo - selecciona un ítem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:295 git-add--interactive.perl:632 +#: builtin/clean.c:301 git-add--interactive.perl:623 #, c-format msgid "" "Prompt help:\n" @@ -6172,38 +6368,38 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:511 git-add--interactive.perl:598 -#: git-add--interactive.perl:603 +#: builtin/clean.c:517 git-add--interactive.perl:589 +#: git-add--interactive.perl:594 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" -#: builtin/clean.c:653 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:690 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s" -#: builtin/clean.c:711 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:752 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:777 git-add--interactive.perl:1669 +#: builtin/clean.c:783 git-add--interactive.perl:1660 #, c-format msgid "Bye.\n" msgstr "Adéu.\n" -#: builtin/clean.c:785 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6221,62 +6417,63 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:812 git-add--interactive.perl:1745 +#: builtin/clean.c:818 git-add--interactive.perl:1736 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:813 git-add--interactive.perl:1742 +#: builtin/clean.c:819 git-add--interactive.perl:1733 msgid "What now" msgstr "I ara què" -#: builtin/clean.c:821 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'ítem següent:" msgstr[1] "Eliminaria els ítems següents:" -#: builtin/clean.c:838 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; s'està sortint." -#: builtin/clean.c:869 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:871 +#: builtin/clean.c:877 msgid "force" msgstr "força" -#: builtin/clean.c:872 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:874 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 +#: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "patró" -#: builtin/clean.c:876 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:877 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:879 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:897 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:901 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6284,7 +6481,7 @@ msgstr "" "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han " "indicat; refusant netejar" -#: builtin/clean.c:904 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6296,129 +6493,134 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:65 +#: builtin/clone.c:80 msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:70 +#: builtin/clone.c:85 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit mirall (implica bare)" -#: builtin/clone.c:72 +#: builtin/clone.c:87 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:74 +#: builtin/clone.c:89 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:76 +#: builtin/clone.c:91 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:78 builtin/clone.c:80 +#: builtin/clone.c:93 builtin/clone.c:97 +msgid "pathspec" +msgstr "especificació de camí" + +#: builtin/clone.c:93 builtin/clone.c:97 msgid "initialize submodules in the clone" msgstr "inicialitza els submòduls en el clon" -#: builtin/clone.c:82 +#: builtin/clone.c:100 msgid "number of submodules cloned in parallel" msgstr "nombre de submòduls clonats en paral·lel" -#: builtin/clone.c:83 builtin/init-db.c:475 +#: builtin/clone.c:101 builtin/init-db.c:475 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:84 builtin/init-db.c:476 +#: builtin/clone.c:102 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 -#: builtin/submodule--helper.c:970 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:90 +#: builtin/clone.c:108 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 msgid "name" msgstr "nom" -#: builtin/clone.c:92 +#: builtin/clone.c:110 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nom> en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:94 +#: builtin/clone.c:112 msgid "checkout <branch> instead of the remote's HEAD" msgstr "agafa <branca> en lloc del HEAD del remot" -#: builtin/clone.c:96 +#: builtin/clone.c:114 msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 +#: builtin/pull.c:202 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:98 +#: builtin/clone.c:116 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 #: parse-options.h:142 msgid "time" msgstr "hora" -#: builtin/clone.c:100 +#: builtin/clone.c:118 msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una hora específica" -#: builtin/clone.c:101 builtin/fetch.c:124 +#: builtin/clone.c:119 builtin/fetch.c:124 msgid "revision" msgstr "revisió" -#: builtin/clone.c:102 builtin/fetch.c:125 +#: builtin/clone.c:120 builtin/fetch.c:125 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" -#: builtin/clone.c:104 +#: builtin/clone.c:122 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:106 +#: builtin/clone.c:124 msgid "any cloned submodules will be shallow" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:107 builtin/init-db.c:484 +#: builtin/clone.c:125 builtin/init-db.c:484 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:108 builtin/init-db.c:485 +#: builtin/clone.c:126 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:109 +#: builtin/clone.c:127 msgid "key=value" msgstr "clau=valor" -#: builtin/clone.c:110 +#: builtin/clone.c:128 msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" -#: builtin/clone.c:250 +#: builtin/clone.c:268 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6426,42 +6628,42 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Si us plau, especifiqueu un directori en la línia d'ordres" -#: builtin/clone.c:303 +#: builtin/clone.c:321 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No s'ha pogut afegir un alternatiu per a '%s': %s\n" -#: builtin/clone.c:375 +#: builtin/clone.c:393 #, c-format msgid "failed to open '%s'" msgstr "s'ha produït un error en obrir '%s'" -#: builtin/clone.c:383 +#: builtin/clone.c:401 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:397 +#: builtin/clone.c:415 #, c-format msgid "failed to stat %s\n" msgstr "s'ha produït un error en fer stat a '%s'\n" -#: builtin/clone.c:419 +#: builtin/clone.c:437 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç '%s'" -#: builtin/clone.c:423 +#: builtin/clone.c:441 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha produït un error en copiar el fitxer a '%s'" -#: builtin/clone.c:448 +#: builtin/clone.c:466 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:460 +#: builtin/clone.c:478 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6472,102 +6674,101 @@ msgstr "" "'git status' i tornar a intentar l'agafament amb\n" "'git checkout -f HEAD'\n" -#: builtin/clone.c:537 +#: builtin/clone.c:555 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:632 +#: builtin/clone.c:650 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:648 +#: builtin/clone.c:666 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:697 +#: builtin/clone.c:715 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:728 +#: builtin/clone.c:746 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:768 +#: builtin/clone.c:786 msgid "unable to write parameters to config file" msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:831 +#: builtin/clone.c:849 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:833 +#: builtin/clone.c:851 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:866 builtin/receive-pack.c:1895 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:870 +#: builtin/clone.c:888 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:883 +#: builtin/clone.c:901 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:886 +#: builtin/clone.c:904 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:899 +#: builtin/clone.c:917 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:905 builtin/fetch.c:1335 +#: builtin/clone.c:923 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:915 +#: builtin/clone.c:933 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "el camí destí '%s' ja existeix i no és un directori buit." -#: builtin/clone.c:925 +#: builtin/clone.c:943 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 -#: builtin/submodule--helper.c:659 builtin/worktree.c:222 -#: builtin/worktree.c:249 +#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:961 #, c-format msgid "could not create work tree dir '%s'" msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'" -#: builtin/clone.c:955 +#: builtin/clone.c:973 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:957 +#: builtin/clone.c:975 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a '%s'...\n" -#: builtin/clone.c:963 +#: builtin/clone.c:999 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6575,39 +6776,39 @@ msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1019 +#: builtin/clone.c:1055 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1021 +#: builtin/clone.c:1057 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1023 +#: builtin/clone.c:1059 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1026 +#: builtin/clone.c:1062 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1031 +#: builtin/clone.c:1067 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1035 +#: builtin/clone.c:1071 #, c-format msgid "Don't know how to clone %s" msgstr "No se sap com clonar %s" -#: builtin/clone.c:1090 builtin/clone.c:1098 +#: builtin/clone.c:1126 builtin/clone.c:1134 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:1101 +#: builtin/clone.c:1137 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -6803,11 +7004,6 @@ msgstr "la comissió '%s' té una línia d'autor mal formada" msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:611 -#, c-format -msgid "invalid date format: %s" -msgstr "format de data no vàlid: %s" - #: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" @@ -6821,7 +7017,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:704 builtin/shortlog.c:295 +#: builtin/commit.c:704 builtin/shortlog.c:294 #, c-format msgid "(reading log message from standard input)\n" msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n" @@ -6921,7 +7117,7 @@ msgstr "No es pot llegir l'índex" msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:968 builtin/tag.c:280 +#: builtin/commit.c:968 builtin/tag.c:273 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n" @@ -6988,7 +7184,7 @@ msgstr "" "S'han especificat camins explícits sense -i o -o; s'està presumint --only " "camins..." -#: builtin/commit.c:1224 builtin/tag.c:495 +#: builtin/commit.c:1224 builtin/tag.c:551 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" @@ -7010,7 +7206,7 @@ msgid "version" msgstr "versió" #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:442 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "sortida llegible per màquina" @@ -7023,7 +7219,7 @@ msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:368 +#: builtin/fast-export.c:984 builtin/tag.c:411 msgid "mode" msgstr "mode" @@ -7081,7 +7277,7 @@ msgstr "mostra la diferència en la plantilla de missatge de comissió" msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1586 builtin/tag.c:366 +#: builtin/commit.c:1586 builtin/tag.c:409 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" @@ -7093,7 +7289,7 @@ msgstr "autor" msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1588 builtin/gc.c:333 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "data" @@ -7101,8 +7297,8 @@ msgstr "data" msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:364 +#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:407 msgid "message" msgstr "missatge" @@ -7111,7 +7307,7 @@ msgid "commit message" msgstr "missatge de comissió" #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "comissió" @@ -7139,7 +7335,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" @@ -7155,7 +7351,7 @@ msgstr "força l'edició de la comissió" msgid "default" msgstr "per defecte" -#: builtin/commit.c:1598 builtin/tag.c:369 +#: builtin/commit.c:1598 builtin/tag.c:412 msgid "how to strip spaces and #comments from message" msgstr "com suprimir els espais i #comentaris del missatge" @@ -7163,8 +7359,8 @@ msgstr "com suprimir els espais i #comentaris del missatge" msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 -#: builtin/revert.c:93 +#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 +#: builtin/revert.c:112 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" @@ -7259,142 +7455,142 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opcions>]" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "Config file location" msgstr "Ubicació del fitxer de configuració" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use global config file" msgstr "usa el fitxer de configuració global" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use system config file" msgstr "usa el fitxer de configuració del sistema" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use repository config file" msgstr "usa el fitxer de configuració del dipòsit" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use given config file" msgstr "usa el fitxer de configuració donat" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "llegeix la configuració de l'objecte de blob donat" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "Action" msgstr "Acció" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "obtén valor: nom [regex-de-valors]" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "obtén tots els valors: clau [regex-de-valors]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "obtén el valor específic per a l'URL: secció[.variable] URL" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "" "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "elimina una variable: nom [regex-de-valors]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "elimina totes les coincidències: nom [regex-de-valors]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "canvia el nom de secció: nom-antic nom-nou" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "elimina una secció: nom" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "list all" msgstr "llista tots" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "troba el color configurat: ranura [per defecte]" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "troba l'ajust de color: ranura [stdout-és-tty]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "Type" msgstr "Tipus" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "el valor és \"true\" o \"false\"" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "el valor és un nombre decimal" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "el valor és --bool o --int" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "el valor és un camí (nom de fitxer o directori)" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "Other" msgstr "Altre" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "show variable names only" msgstr "mostra només els noms de variable" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia " "d'ordres)" -#: builtin/config.c:327 +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:471 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7409,12 +7605,12 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:613 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració '%s'" -#: builtin/config.c:625 +#: builtin/config.c:627 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7431,55 +7627,67 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opcions>] [<comissió>...]" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] --dirty" msgstr "git describe [<opcions>] --dirty" -#: builtin/describe.c:217 +#: builtin/describe.c:53 +msgid "head" +msgstr "davant per" + +#: builtin/describe.c:53 +msgid "lightweight" +msgstr "lleuger" + +#: builtin/describe.c:53 +msgid "annotated" +msgstr "anotat" + +#: builtin/describe.c:250 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:221 +#: builtin/describe.c:254 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'etiqueta anotada %s no té nom incrustat" -#: builtin/describe.c:223 +#: builtin/describe.c:256 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'etiqueta '%s' realment és '%s' aquí" -#: builtin/describe.c:250 builtin/log.c:480 +#: builtin/describe.c:283 builtin/log.c:487 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:253 +#: builtin/describe.c:286 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de '%s' vàlid" -#: builtin/describe.c:270 +#: builtin/describe.c:303 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb '%s'" -#: builtin/describe.c:272 +#: builtin/describe.c:305 #, c-format msgid "searching to describe %s\n" msgstr "s'està cercant per a descriure %s\n" -#: builtin/describe.c:319 +#: builtin/describe.c:352 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:346 +#: builtin/describe.c:379 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7488,7 +7696,7 @@ msgstr "" "Cap etiqueta anotada pot descriure '%s'.\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:350 +#: builtin/describe.c:383 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7497,12 +7705,12 @@ msgstr "" "Cap etiqueta pot descriure '%s'.\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:371 +#: builtin/describe.c:413 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:374 +#: builtin/describe.c:416 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7511,66 +7719,78 @@ msgstr "" "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n" "s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:396 +#: builtin/describe.c:438 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:397 +#: builtin/describe.c:439 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:398 +#: builtin/describe.c:440 msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:399 +#: builtin/describe.c:441 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:400 +#: builtin/describe.c:442 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:401 +#: builtin/describe.c:443 msgid "only follow first parent" msgstr "només segueix la primera mare" -#: builtin/describe.c:404 +#: builtin/describe.c:446 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:406 +#: builtin/describe.c:448 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:408 +#: builtin/describe.c:450 msgid "only consider tags matching <pattern>" msgstr "només considera les etiquetes que coincideixen amb <patró>" -#: builtin/describe.c:410 builtin/name-rev.c:320 +#: builtin/describe.c:452 +msgid "do not consider tags matching <pattern>" +msgstr "no consideris les etiquetes que no coincideixen amb <patró>" + +#: builtin/describe.c:454 builtin/name-rev.c:357 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:411 +#: builtin/describe.c:455 builtin/describe.c:458 msgid "mark" msgstr "marca" -#: builtin/describe.c:412 +#: builtin/describe.c:456 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:430 +#: builtin/describe.c:459 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")" + +#: builtin/describe.c:477 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:456 +#: builtin/describe.c:506 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:476 +#: builtin/describe.c:549 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" +#: builtin/describe.c:551 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken és incompatible amb les comissions" + #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" @@ -7605,82 +7825,97 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]" #: builtin/difftool.c:241 -#, c-format +#, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:342 +#: builtin/difftool.c:283 +#, c-format +msgid "could not read symlink %s" +msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" + +#: builtin/difftool.c:285 +#, c-format +msgid "could not read symlink file %s" +msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s" + +#: builtin/difftool.c:293 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s" + +#: builtin/difftool.c:395 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:567 +#: builtin/difftool.c:609 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: '%s' i '%s'." -#: builtin/difftool.c:569 +#: builtin/difftool.c:611 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:580 +#: builtin/difftool.c:622 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a %s'." -#: builtin/difftool.c:581 +#: builtin/difftool.c:623 msgid "you may want to cleanup or recover these." -msgstr "podeu voleu netejar o recuperar-los." +msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:626 +#: builtin/difftool.c:669 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" -#: builtin/difftool.c:628 +#: builtin/difftool.c:671 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:630 +#: builtin/difftool.c:673 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:636 +#: builtin/difftool.c:679 msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" -#: builtin/difftool.c:637 +#: builtin/difftool.c:680 msgid "<tool>" msgstr "<tool>" -#: builtin/difftool.c:638 +#: builtin/difftool.c:681 msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:640 +#: builtin/difftool.c:683 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimeix una llista de totes les eines diff que es podeu usar amb `--tool`" -#: builtin/difftool.c:643 +#: builtin/difftool.c:686 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:645 +#: builtin/difftool.c:688 msgid "<command>" msgstr "<command>" -#: builtin/difftool.c:646 +#: builtin/difftool.c:689 msgid "specify a custom command for viewing diffs" msgstr "especifiqueu una ordre personalitzada per veure diffs" -#: builtin/difftool.c:670 +#: builtin/difftool.c:713 msgid "no <tool> given for --tool=<tool>" msgstr "no s'ha proporcionat <tool> per --tool=<tool>" -#: builtin/difftool.c:677 +#: builtin/difftool.c:720 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>" @@ -7816,7 +8051,7 @@ msgstr "aprofundeix la història d'un clon superficial basat en temps" msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:131 builtin/log.c:1433 +#: builtin/fetch.c:131 builtin/log.c:1440 msgid "dir" msgstr "directori" @@ -7844,74 +8079,74 @@ msgstr "mostra el mapa de referències d'obtenció" msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:511 +#: builtin/fetch.c:513 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuració fetch.output conté un valor no vàlid %s" -#: builtin/fetch.c:604 +#: builtin/fetch.c:606 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:608 +#: builtin/fetch.c:610 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:621 builtin/fetch.c:701 +#: builtin/fetch.c:623 builtin/fetch.c:703 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:622 +#: builtin/fetch.c:624 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:631 +#: builtin/fetch.c:633 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 -#: builtin/fetch.c:696 +#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 +#: builtin/fetch.c:698 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:651 +#: builtin/fetch.c:653 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:654 +#: builtin/fetch.c:656 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:659 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:696 +#: builtin/fetch.c:698 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:701 +#: builtin/fetch.c:703 msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:746 +#: builtin/fetch.c:748 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:766 +#: builtin/fetch.c:768 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:853 builtin/fetch.c:949 +#: builtin/fetch.c:855 builtin/fetch.c:951 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:864 +#: builtin/fetch.c:866 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7921,55 +8156,55 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:919 +#: builtin/fetch.c:921 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:920 +#: builtin/fetch.c:922 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:952 +#: builtin/fetch.c:954 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:953 builtin/remote.c:1020 +#: builtin/fetch.c:955 builtin/remote.c:1022 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:978 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:995 +#: builtin/fetch.c:997 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s" -#: builtin/fetch.c:998 +#: builtin/fetch.c:1000 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1076 #, c-format msgid "Don't know how to fetch from %s" msgstr "No se sap com obtenir de %s" -#: builtin/fetch.c:1234 +#: builtin/fetch.c:1236 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1236 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1254 +#: builtin/fetch.c:1256 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7977,40 +8212,40 @@ msgstr "" "Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1279 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1321 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1323 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth són mutualment exclusius" -#: builtin/fetch.c:1326 +#: builtin/fetch.c:1328 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1330 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1352 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1354 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1363 +#: builtin/fetch.c:1365 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1371 +#: builtin/fetch.c:1373 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" @@ -8049,17 +8284,17 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objecte>]" #: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<objecte>]]" +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [--contains [<object>]]" -msgstr "git for-each-ref [--contains [<objecte>]]" +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]" #: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "" -"posa els marcadors de posició entre cometes de forma adequada per a " +"posa els marcadors de posició de forma adequada per a " "intèrprets d'ordres" #: builtin/for-each-ref.c:29 @@ -8078,10 +8313,6 @@ msgstr "posa els marcadors de posició entre cometes adequades per al Tcl" msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 -msgid "format to use for the output" -msgstr "format a usar en la sortida" - #: builtin/for-each-ref.c:41 msgid "print only refs which points at the given object" msgstr "imprimeix només les referències que assenyalin l'objecte donat" @@ -8098,6 +8329,10 @@ msgstr "imprimeix només les referències que no s'han fusionat" msgid "print only refs which contain the commit" msgstr "imprimeix només les referències que continguin la comissió" +#: builtin/for-each-ref.c:46 +msgid "print only refs which don't contain the commit" +msgstr "imprimeix només les referències que no continguin la comissió" + #: builtin/fsck.c:554 msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" @@ -8162,17 +8397,17 @@ msgstr "S'estan comprovant els objectes" msgid "git gc [<options>]" msgstr "git gc [<opcions>]" -#: builtin/gc.c:72 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "%s no vàlid: %s" +#: builtin/gc.c:78 +#, , c-format +msgid "Failed to fstat %s: %s" +msgstr "S'ha produït un error en fer fstat %s: %s" -#: builtin/gc.c:139 +#: builtin/gc.c:310 #, c-format -msgid "insanely long object directory %.*s" -msgstr "directori d'objectes increïblement llarg %.*s" +msgid "Can't stat %s" +msgstr "No es pot fer stat en %s" -#: builtin/gc.c:297 +#: builtin/gc.c:319 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8187,47 +8422,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:334 +#: builtin/gc.c:358 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:336 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:337 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:338 +#: builtin/gc.c:362 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:380 +#: builtin/gc.c:379 +#, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" + +#: builtin/gc.c:407 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "S'està empaquetant el dipòsit automàticament en el fons per rendiment " "òptim.\n" -#: builtin/gc.c:382 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n" -#: builtin/gc.c:383 +#: builtin/gc.c:410 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu \"git help gc\" per neteja manual.\n" -#: builtin/gc.c:404 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "gc ja s'està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:448 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8248,239 +8488,244 @@ msgstr "grep: s'ha produït un error en crear fil: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" -#: builtin/grep.c:763 builtin/grep.c:804 +#: builtin/grep.c:769 builtin/grep.c:810 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:823 +#: builtin/grep.c:829 #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" -#: builtin/grep.c:887 +#: builtin/grep.c:893 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció `%c' espera un valor numèric" -#: builtin/grep.c:973 +#: builtin/grep.c:980 msgid "search in index instead of in the work tree" msgstr "cerca en l'índex en lloc de l'arbre de treball" -#: builtin/grep.c:975 +#: builtin/grep.c:982 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:977 +#: builtin/grep.c:984 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:979 +#: builtin/grep.c:986 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:981 -msgid "recursivley search in each submodule" +#: builtin/grep.c:988 +msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "basename" msgstr "nom base" -#: builtin/grep.c:984 +#: builtin/grep.c:991 msgid "prepend parent project's basename to output" msgstr "anteposa això a la sortida del nom base del projecte pare" -#: builtin/grep.c:987 +#: builtin/grep.c:994 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:989 +#: builtin/grep.c:996 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:991 +#: builtin/grep.c:998 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:993 +#: builtin/grep.c:1000 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:995 +#: builtin/grep.c:1002 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:998 +#: builtin/grep.c:1005 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:1000 +#: builtin/grep.c:1007 msgid "descend at most <depth> levels" msgstr "descendeix com a màxim <profunditat> nivells" -#: builtin/grep.c:1004 +#: builtin/grep.c:1011 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX esteses" -#: builtin/grep.c:1007 +#: builtin/grep.c:1014 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:1010 +#: builtin/grep.c:1017 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:1013 +#: builtin/grep.c:1020 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:1016 +#: builtin/grep.c:1023 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:1017 +#: builtin/grep.c:1024 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:1018 +#: builtin/grep.c:1025 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:1020 +#: builtin/grep.c:1027 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:1022 +#: builtin/grep.c:1029 msgid "show only filenames instead of matching lines" msgstr "mostra només els noms de fitxer en lloc de les línies coincidents" -#: builtin/grep.c:1024 +#: builtin/grep.c:1031 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:1029 +#: builtin/grep.c:1036 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:1031 +#: builtin/grep.c:1038 msgid "show the number of matches instead of matching lines" msgstr "mostra el nombre de coincidències en lloc de les línies coincidents" -#: builtin/grep.c:1032 +#: builtin/grep.c:1039 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:1034 +#: builtin/grep.c:1041 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:1036 +#: builtin/grep.c:1043 msgid "show filename only once above matches from same file" msgstr "" "mostra el nom de fitxer només una vegada a dalt de les coincidències del " "mateix fitxer" -#: builtin/grep.c:1039 +#: builtin/grep.c:1046 msgid "show <n> context lines before and after matches" msgstr "mostra <n> línies de context abans i després d'una coincidència" -#: builtin/grep.c:1042 +#: builtin/grep.c:1049 msgid "show <n> context lines before matches" msgstr "mostra <n> línies de context abans d'una coincidència" -#: builtin/grep.c:1044 +#: builtin/grep.c:1051 msgid "show <n> context lines after matches" msgstr "mostra <n> línies de context després d'una coincidència" -#: builtin/grep.c:1046 +#: builtin/grep.c:1053 msgid "use <n> worker threads" msgstr "usa <n> fils de treball" -#: builtin/grep.c:1047 +#: builtin/grep.c:1054 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:1050 +#: builtin/grep.c:1057 msgid "show a line with the function name before matches" msgstr "mostra una línia amb el nom de funció abans de les coincidències" -#: builtin/grep.c:1052 +#: builtin/grep.c:1059 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:1055 +#: builtin/grep.c:1062 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:1057 +#: builtin/grep.c:1064 msgid "match <pattern>" msgstr "coincideix amb <patró>" -#: builtin/grep.c:1059 +#: builtin/grep.c:1066 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:1071 +#: builtin/grep.c:1078 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:1073 +#: builtin/grep.c:1080 msgid "show only matches from files that match all patterns" msgstr "" "mostra només les coincidències dels fitxers que coincideixin amb tots els " "patrons" -#: builtin/grep.c:1075 +#: builtin/grep.c:1082 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisis de l'expressió de grep" -#: builtin/grep.c:1079 +#: builtin/grep.c:1086 msgid "pager" msgstr "paginador" -#: builtin/grep.c:1079 +#: builtin/grep.c:1086 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:1082 +#: builtin/grep.c:1089 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:1146 +#: builtin/grep.c:1153 msgid "no pattern given." msgstr "cap patró donat." -#: builtin/grep.c:1178 builtin/index-pack.c:1482 +#: builtin/grep.c:1189 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index o --untracked no es pot usar amb revisions" + +#: builtin/grep.c:1195 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "no s'ha pogut resoldre la revisió: %s" + +#: builtin/grep.c:1228 builtin/index-pack.c:1485 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1215 +#: builtin/grep.c:1251 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager només funciona en l'arbre de treball" -#: builtin/grep.c:1238 +#: builtin/grep.c:1274 msgid "option not supported with --recurse-submodules." msgstr "opció no admesa amb --recurse-submodules." -#: builtin/grep.c:1244 +#: builtin/grep.c:1280 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:1249 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index o --untracked no es pot usar amb revisions." - -#: builtin/grep.c:1252 +#: builtin/grep.c:1286 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:1260 +#: builtin/grep.c:1294 msgid "both --cached and trees are given." msgstr "s'han donat ambdós --caches i arbres." @@ -8707,48 +8952,49 @@ msgstr "el paquet supera la mida màxima permesa" msgid "unable to create '%s'" msgstr "no s'ha pogut crear '%s'" -#: builtin/index-pack.c:322 +#: builtin/index-pack.c:323 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet '%s'" -#: builtin/index-pack.c:336 +#: builtin/index-pack.c:337 msgid "pack signature mismatch" msgstr "hi ha una discordança de signatura de paquet" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la versió de paquet %<PRIu32> no és compatible" -#: builtin/index-pack.c:356 +#: builtin/index-pack.c:357 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s" -#: builtin/index-pack.c:478 +#: builtin/index-pack.c:479 #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:528 msgid "offset value overflow for delta base object" -msgstr "desbordament de valor de desplaçament per a l'objecte base de delta" +msgstr "" +"desbordament de valor de desplaçament per a l'objecte base de diferències" -#: builtin/index-pack.c:535 +#: builtin/index-pack.c:536 msgid "delta base offset is out of bound" -msgstr "el desplaçament de base de delta està fora de límits" +msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/index-pack.c:543 +#: builtin/index-pack.c:544 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:574 +#: builtin/index-pack.c:575 msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:577 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -8756,192 +9002,197 @@ msgstr[0] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet" msgstr[1] "" "el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets" -#: builtin/index-pack.c:602 +#: builtin/index-pack.c:603 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:813 builtin/index-pack.c:822 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:752 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:257 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:819 +#: builtin/index-pack.c:814 +#, c-format +msgid "cannot read existing object info %s" +msgstr "no es pot llegir la informació de objecte existent %s" + +#: builtin/index-pack.c:822 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:836 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:853 msgid "Error in object" msgstr "Error en objecte" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:855 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s són abastables" -#: builtin/index-pack.c:924 builtin/index-pack.c:955 +#: builtin/index-pack.c:927 builtin/index-pack.c:958 msgid "failed to apply delta" -msgstr "s'ha produït un error en aplicar la delta" +msgstr "s'ha produït un error en aplicar la diferència" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1128 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1128 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1165 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1168 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1176 +#: builtin/index-pack.c:1179 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1199 +#: builtin/index-pack.c:1202 msgid "Resolving deltas" -msgstr "S'estan resolent les deltes" +msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1213 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1258 +#: builtin/index-pack.c:1261 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "s'ha completat amb %d objecte local" msgstr[1] "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1273 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1277 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" -msgstr[0] "El paquet té %d delta no resolta" -msgstr[1] "El paquet té %d deltes no resoltes" +msgstr[0] "El paquet té %d diferència no resolta" +msgstr[1] "El paquet té %d diferències no resoltes" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1301 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1377 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1403 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1411 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1423 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1432 +#: builtin/index-pack.c:1433 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1443 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1479 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 +#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1547 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1546 +#: builtin/index-pack.c:1549 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" -msgstr[0] "sense delta: %d objecte" -msgstr[1] "sense delta: %d objectes" +msgstr[0] "sense diferències: %d objecte" +msgstr[1] "sense diferències: %d objectes" -#: builtin/index-pack.c:1600 +#: builtin/index-pack.c:1603 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1613 +#: builtin/index-pack.c:1616 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'" -#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 -#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 +#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 +#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1734 +#: builtin/index-pack.c:1737 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1736 +#: builtin/index-pack.c:1739 msgid "--stdin requires a git repository" msgstr "--stdin requereix d'un dipòsit git" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1747 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" @@ -9101,104 +9352,104 @@ msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]" msgid "git show [<options>] <object>..." msgstr "git show [<opcions>] <objecte>..." -#: builtin/log.c:84 +#: builtin/log.c:89 #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no vàlida: %s" -#: builtin/log.c:139 +#: builtin/log.c:144 msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: builtin/log.c:140 +#: builtin/log.c:145 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:141 +#: builtin/log.c:146 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:142 +#: builtin/log.c:147 msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:145 +#: builtin/log.c:150 msgid "Process line range n,m in file, counting from 1" msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1" -#: builtin/log.c:241 +#: builtin/log.c:246 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:486 +#: builtin/log.c:493 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer dolent" -#: builtin/log.c:500 builtin/log.c:594 +#: builtin/log.c:507 builtin/log.c:601 #, c-format msgid "Could not read object %s" msgstr "No es pot llegir l'objecte %s" -#: builtin/log.c:618 +#: builtin/log.c:625 #, c-format msgid "Unknown type: %d" msgstr "Tipus desconegut: %d" -#: builtin/log.c:739 +#: builtin/log.c:746 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:839 +#: builtin/log.c:846 msgid "name of output directory is too long" msgstr "el nom del directori de sortida és massa llarg" -#: builtin/log.c:854 +#: builtin/log.c:861 #, c-format msgid "Cannot open patch file %s" msgstr "No es pot obrir el fitxer de pedaç %s" -#: builtin/log.c:868 +#: builtin/log.c:875 msgid "Need exactly one range." msgstr "Cal exactament un rang." -#: builtin/log.c:878 +#: builtin/log.c:885 msgid "Not a range." msgstr "No és un rang." -#: builtin/log.c:984 +#: builtin/log.c:991 msgid "Cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:1063 +#: builtin/log.c:1071 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1091 +#: builtin/log.c:1098 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" -#: builtin/log.c:1141 +#: builtin/log.c:1148 msgid "Two output directories?" msgstr "Hi ha dos directoris de sortida?" -#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 +#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 #, c-format msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 +#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "S'ha produït un error en resoldre '%s' com a referència vàlida." -#: builtin/log.c:1263 +#: builtin/log.c:1270 msgid "Could not find exact merge base." msgstr "No s'ha pogut trobar la base exacta de fusió." -#: builtin/log.c:1267 +#: builtin/log.c:1274 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" @@ -9210,215 +9461,215 @@ msgstr "" "seguir una branca remot. O podeu especificar la comissió base manualment\n" "amb --base=<id-de-comissió-base>." -#: builtin/log.c:1287 +#: builtin/log.c:1294 msgid "Failed to find exact merge base" msgstr "S'ha produït un error en trobar la base exacta de fusió." -#: builtin/log.c:1298 +#: builtin/log.c:1305 msgid "base commit should be the ancestor of revision list" msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions" -#: builtin/log.c:1302 +#: builtin/log.c:1309 msgid "base commit shouldn't be in revision list" msgstr "la comissió base no ha de ser en la llista de revisions" -#: builtin/log.c:1351 +#: builtin/log.c:1358 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1408 +#: builtin/log.c:1415 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç" -#: builtin/log.c:1411 +#: builtin/log.c:1418 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1415 +#: builtin/log.c:1422 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1417 +#: builtin/log.c:1424 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1419 +#: builtin/log.c:1426 msgid "use simple number sequence for output file names" msgstr "usa una seqüència de números per als noms dels fitxers de sortida" -#: builtin/log.c:1420 +#: builtin/log.c:1427 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1421 +#: builtin/log.c:1428 msgid "use <sfx> instead of '.patch'" msgstr "usa <sufix> en lloc de '.patch'" -#: builtin/log.c:1423 +#: builtin/log.c:1430 msgid "start numbering patches at <n> instead of 1" msgstr "comença numerant els pedaços a <n> en lloc d'1" -#: builtin/log.c:1425 +#: builtin/log.c:1432 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1427 +#: builtin/log.c:1434 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1430 +#: builtin/log.c:1437 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefix>] en lloc de [PATCH]" -#: builtin/log.c:1433 +#: builtin/log.c:1440 msgid "store resulting files in <dir>" msgstr "emmagatzema els fitxers resultants a <directori>" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1439 +#: builtin/log.c:1446 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "don't include a patch matching a commit upstream" msgstr "no incloguis pedaços que coincideixin amb comissions a la font" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "header" msgstr "capçalera" -#: builtin/log.c:1449 +#: builtin/log.c:1456 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1450 builtin/log.c:1452 +#: builtin/log.c:1457 builtin/log.c:1459 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1452 +#: builtin/log.c:1459 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1454 +#: builtin/log.c:1461 msgid "ident" msgstr "identitat" -#: builtin/log.c:1455 +#: builtin/log.c:1462 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "estableix l'adreça From a <identitat> (o la identitat del comitent si manca)" -#: builtin/log.c:1457 +#: builtin/log.c:1464 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1458 +#: builtin/log.c:1465 msgid "make first mail a reply to <message-id>" msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>" -#: builtin/log.c:1459 builtin/log.c:1462 +#: builtin/log.c:1466 builtin/log.c:1469 msgid "boundary" msgstr "límit" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "attach the patch" msgstr "ajunta el pedaç" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1469 +#: builtin/log.c:1476 msgid "signature" msgstr "signatura" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços" -#: builtin/log.c:1474 +#: builtin/log.c:1481 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1565 +#: builtin/log.c:1572 msgid "-n and -k are mutually exclusive." msgstr "-n i -k són mutualment exclusius." -#: builtin/log.c:1567 +#: builtin/log.c:1574 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc i -k són mutualment exclusius." -#: builtin/log.c:1575 +#: builtin/log.c:1582 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1577 +#: builtin/log.c:1584 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1579 +#: builtin/log.c:1586 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1609 +#: builtin/log.c:1616 msgid "standard output, or directory, which one?" msgstr "sortida estàndard o directori, quin dels dos?" -#: builtin/log.c:1611 +#: builtin/log.c:1618 #, c-format msgid "Could not create directory '%s'" msgstr "No s'ha pogut crear el directori '%s'" -#: builtin/log.c:1705 +#: builtin/log.c:1712 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura '%s'" -#: builtin/log.c:1777 +#: builtin/log.c:1784 msgid "Failed to create output files" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:1826 +#: builtin/log.c:1833 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]" -#: builtin/log.c:1880 +#: builtin/log.c:1887 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9426,105 +9677,105 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu " "<font> manualment.\n" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opcions>] [<fitxer>...]" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "" "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:524 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:534 msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris 'other'" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "mostra els terminadors de línia dels fitxers" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "mostra la informació de resolució de desfet" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "omet els fitxers coincidents amb el patró" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "els patrons d'exclusió es llegeixen de <fitxer>" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "afegeix les exclusions estàndards de git" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "fes que la sortida sigui relativa al directori superior del projecte" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "inclou recursivament als submòduls" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:563 msgid "if any <file> is not in the index, treat this as an error" msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "pretén que els camins eliminats després de <arbre> encara siguin presents" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "mostra les dades de depuració" @@ -9539,39 +9790,39 @@ msgstr "" " [--exit-code] [--get-url] [--symref]\n" " [<dipòsit> [<referències>...]]" -#: builtin/ls-remote.c:50 +#: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" -#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "executable" -#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "camí a git-upload-pack en la màquina remota" -#: builtin/ls-remote.c:56 +#: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "limita a etiquetes" -#: builtin/ls-remote.c:57 +#: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "limita a caps" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "no mostris les etiquetes pelades" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:62 msgid "take url.<base>.insteadOf into account" msgstr "tingues en compte url.<base>.insteadOf" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:64 msgid "exit with exit code 2 if no matching refs are found" msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:66 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostra la referència subjacent a més de l'objecte que senyali" @@ -9617,148 +9868,144 @@ msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opcions>] [<comissió>...]" #: builtin/merge.c:47 -msgid "git merge [<options>] <msg> HEAD <commit>" -msgstr "git merge [<opcions>] <missatge> HEAD <comissió>" - -#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:48 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:103 msgid "switch `m' requires a value" msgstr "l'opció `m' requereix un valor" -#: builtin/merge.c:141 +#: builtin/merge.c:140 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:147 +#: builtin/merge.c:146 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:197 builtin/pull.c:127 +#: builtin/merge.c:196 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:200 builtin/pull.c:130 +#: builtin/merge.c:199 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:201 builtin/pull.c:133 +#: builtin/merge.c:200 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:203 builtin/pull.c:136 +#: builtin/merge.c:202 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:206 builtin/pull.c:139 +#: builtin/merge.c:205 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:208 builtin/pull.c:142 +#: builtin/merge.c:207 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:210 builtin/pull.c:145 +#: builtin/merge.c:209 builtin/pull.c:145 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:211 +#: builtin/merge.c:210 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:213 builtin/pull.c:151 +#: builtin/merge.c:212 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:217 builtin/pull.c:154 +#: builtin/merge.c:216 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida" -#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 -#: builtin/revert.c:89 +#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 +#: builtin/revert.c:108 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:219 builtin/pull.c:159 +#: builtin/merge.c:218 builtin/pull.c:159 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:220 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:221 builtin/pull.c:163 +#: builtin/merge.c:220 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:223 +#: builtin/merge.c:222 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)" -#: builtin/merge.c:227 +#: builtin/merge.c:226 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:229 +#: builtin/merge.c:228 msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:231 builtin/pull.c:170 +#: builtin/merge.c:230 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge.c:259 +#: builtin/merge.c:258 msgid "could not run stash." msgstr "no s'ha pogut executar stash." -#: builtin/merge.c:264 +#: builtin/merge.c:263 msgid "stash failed" msgstr "l'emmagatzemament ha fallat" -#: builtin/merge.c:269 +#: builtin/merge.c:268 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:287 builtin/merge.c:304 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:335 +#: builtin/merge.c:334 msgid " (nothing to squash)" msgstr " (res a fer «squash»)" -#: builtin/merge.c:346 +#: builtin/merge.c:345 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:395 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no assenyala una comissió" -#: builtin/merge.c:537 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions dolenta: %s" @@ -9820,64 +10067,59 @@ msgstr "" "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el " "resultat.\n" -#: builtin/merge.c:867 -#, c-format -msgid "'%s' is not a commit" -msgstr "'%s' no és una comissió" - -#: builtin/merge.c:908 +#: builtin/merge.c:890 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:910 +#: builtin/merge.c:892 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:912 +#: builtin/merge.c:894 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:917 +#: builtin/merge.c:899 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:964 +#: builtin/merge.c:946 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor dolent '%s' en l'entorn '%s'" -#: builtin/merge.c:1038 +#: builtin/merge.c:1020 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar '%s'" -#: builtin/merge.c:1065 +#: builtin/merge.c:1047 #, c-format msgid "not something we can merge in %s: %s" -msgstr "no és cosa que puguem fusionar en %s: %s" +msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1099 +#: builtin/merge.c:1081 msgid "not something we can merge" -msgstr "no és cosa que puguem fusionar" +msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1167 +#: builtin/merge.c:1146 msgid "--abort expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1171 +#: builtin/merge.c:1150 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1183 +#: builtin/merge.c:1162 msgid "--continue expects no arguments" msgstr "--continue no accepta paràmetres" -#: builtin/merge.c:1187 +#: builtin/merge.c:1166 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)." -#: builtin/merge.c:1203 +#: builtin/merge.c:1182 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9885,7 +10127,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1210 +#: builtin/merge.c:1189 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9893,114 +10135,114 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1213 +#: builtin/merge.c:1192 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1222 +#: builtin/merge.c:1201 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1230 +#: builtin/merge.c:1209 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hi ha una comissió especificada i merge.defaultToUpstream no està " "establert." -#: builtin/merge.c:1247 +#: builtin/merge.c:1226 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1249 +#: builtin/merge.c:1228 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit" -#: builtin/merge.c:1254 +#: builtin/merge.c:1233 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1256 +#: builtin/merge.c:1235 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a un HEAD buit" -#: builtin/merge.c:1312 +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: builtin/merge.c:1315 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s." -#: builtin/merge.c:1318 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: builtin/merge.c:1321 +#: builtin/merge.c:1278 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: builtin/merge.c:1383 +#: builtin/merge.c:1340 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1392 +#: builtin/merge.c:1349 msgid "Already up-to-date." msgstr "Ja està al dia." -#: builtin/merge.c:1402 +#: builtin/merge.c:1359 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1443 +#: builtin/merge.c:1400 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1407 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1432 msgid "Already up-to-date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1481 +#: builtin/merge.c:1438 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1504 builtin/merge.c:1583 +#: builtin/merge.c:1461 builtin/merge.c:1540 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1508 +#: builtin/merge.c:1465 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1531 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1576 +#: builtin/merge.c:1533 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1542 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1554 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10056,35 +10298,35 @@ msgstr "" "git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> " "<fitxer-original> <fitxer2>" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:32 msgid "send results to standard output" msgstr "envia els resultats a la sortida estàndard" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:33 msgid "use a diff3 based merge" msgstr "usa una fusió basada en diff3" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:34 msgid "for conflicts, use our version" msgstr "en conflictes, usa la nostra versió" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:36 msgid "for conflicts, use their version" msgstr "en conflictes, usa la seva versió" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:38 msgid "for conflicts, use a union version" msgstr "en conflictes, usa una versió d'unió" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:41 msgid "for conflicts, use this marker size" msgstr "en conflictes, usa aquesta mida de marcador" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c:42 msgid "do not warn about conflicts" msgstr "no avisis de conflictes" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:44 msgid "set labels for file1/orig-file/file2" msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" @@ -10229,43 +10471,47 @@ msgstr "S'està canviant el nom de %s a %s\n" msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:289 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opcions>] <comissió>..." -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:290 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:291 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opcions>] --stdin" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:346 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:347 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:349 msgid "only use refs matching <pattern>" msgstr "només usa les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:351 +msgid "ignore refs matching <pattern>" +msgstr "ignora les referències que coincideixin amb <patró>" + +#: builtin/name-rev.c:353 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:354 msgid "read from stdin" msgstr "llegeix d'stdin" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:355 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:324 +#: builtin/name-rev.c:361 msgid "dereference tags in the input (internal use)" msgstr "dereferencia les etiquetes en l'entrada (ús intern)" @@ -10340,7 +10586,7 @@ msgstr "git notes add [<opcions>] [<objecte>]" #: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "git notes copy [<options>] <d'objecte> <a-objecte>" +msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>" #: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." @@ -10415,19 +10661,19 @@ msgstr "no s'ha pogut escriure l'objecte de nota" msgid "the note contents have been left in %s" msgstr "s'han deixat els continguts de la nota en %s" -#: builtin/notes.c:233 builtin/tag.c:460 +#: builtin/notes.c:233 builtin/tag.c:516 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir '%s'" -#: builtin/notes.c:235 builtin/tag.c:463 +#: builtin/notes.c:235 builtin/tag.c:519 #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir '%s'" #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "s'ha produït un error en resoldre '%s' com a referència vàlida." @@ -10460,12 +10706,12 @@ msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)" #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 -#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 +#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 msgid "too many parameters" msgstr "massa paràmetres" -#: builtin/notes.c:378 builtin/notes.c:665 +#: builtin/notes.c:378 builtin/notes.c:664 #, c-format msgid "no note found for object %s." msgstr "no s'ha trobat cap nota per a l'objecte %s." @@ -10508,7 +10754,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n" -#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 +#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 #, c-format msgid "Removing note for object %s\n" msgstr "S'està eliminant la nota de l'objecte %s\n" @@ -10549,53 +10795,53 @@ msgstr "" "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n" -#: builtin/notes.c:685 +#: builtin/notes.c:684 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL" -#: builtin/notes.c:687 +#: builtin/notes.c:686 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF" -#: builtin/notes.c:689 +#: builtin/notes.c:688 msgid "failed to remove 'git notes merge' worktree" msgstr "" "s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'" -#: builtin/notes.c:709 +#: builtin/notes.c:708 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL" -#: builtin/notes.c:711 +#: builtin/notes.c:710 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:713 +#: builtin/notes.c:712 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:726 +#: builtin/notes.c:725 msgid "failed to resolve NOTES_MERGE_REF" msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF" -#: builtin/notes.c:729 +#: builtin/notes.c:728 msgid "failed to finalize notes merge" msgstr "s'ha produït un error en finalitzar la fusió de notes" -#: builtin/notes.c:755 +#: builtin/notes.c:754 #, c-format msgid "unknown notes merge strategy %s" msgstr "estratègia de fusió de notes desconeguda %s" -#: builtin/notes.c:771 +#: builtin/notes.c:770 msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:773 +#: builtin/notes.c:772 msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:775 +#: builtin/notes.c:774 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10603,48 +10849,48 @@ msgstr "" "resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" "union/cat_sort_uniq)" -#: builtin/notes.c:777 +#: builtin/notes.c:776 msgid "Committing unmerged notes" msgstr "S'estan cometent les notes sense fusionar" -#: builtin/notes.c:779 +#: builtin/notes.c:778 msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes cometent les notes sense fusionar" -#: builtin/notes.c:781 +#: builtin/notes.c:780 msgid "Aborting notes merge resolution" msgstr "S'està avortant la resolució de fusió de notes" -#: builtin/notes.c:783 +#: builtin/notes.c:782 msgid "abort notes merge" msgstr "avorta la fusió de notes" -#: builtin/notes.c:794 +#: builtin/notes.c:793 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no es pot combinar --commit, --abort i -s/--strategy" -#: builtin/notes.c:799 +#: builtin/notes.c:798 msgid "must specify a notes ref to merge" msgstr "cal especificar una referència de notes a fusionar" -#: builtin/notes.c:823 +#: builtin/notes.c:822 #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconeguda: %s" -#: builtin/notes.c:860 +#: builtin/notes.c:859 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "una fusió de notes a %s ja està en curs a %s" -#: builtin/notes.c:863 +#: builtin/notes.c:862 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "s'ha produït un error en emmagatzemar l'enllaç a la referència de notes " "actual (%s)" -#: builtin/notes.c:865 +#: builtin/notes.c:864 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10655,36 +10901,36 @@ msgstr "" "cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb " "'git notes merge --abort'.\n" -#: builtin/notes.c:887 +#: builtin/notes.c:886 #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:899 +#: builtin/notes.c:898 msgid "attempt to remove non-existent note is not an error" msgstr "l'intent d'eliminar una nota no existent no és un error" -#: builtin/notes.c:902 +#: builtin/notes.c:901 msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "no eliminis, només mostra" -#: builtin/notes.c:941 +#: builtin/notes.c:940 msgid "report pruned notes" msgstr "informa de notes podades" -#: builtin/notes.c:983 +#: builtin/notes.c:982 msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:984 +#: builtin/notes.c:983 msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" -#: builtin/notes.c:1019 +#: builtin/notes.c:1018 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" @@ -10708,182 +10954,183 @@ msgstr "" msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:770 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets " "a causa de pack.packSizeLimit" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:783 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:1068 +#: builtin/pack-objects.c:1063 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'empaqueten" -#: builtin/pack-objects.c:2344 +#: builtin/pack-objects.c:2426 msgid "Compressing objects" msgstr "S'estan comprimint objectes" -#: builtin/pack-objects.c:2747 +#: builtin/pack-objects.c:2829 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2833 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex dolenta '%s'" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2863 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2865 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2785 +#: builtin/pack-objects.c:2867 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2788 +#: builtin/pack-objects.c:2870 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2789 +#: builtin/pack-objects.c:2871 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2790 +#: builtin/pack-objects.c:2872 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2875 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2877 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2879 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2799 +#: builtin/pack-objects.c:2881 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2883 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:2803 +#: builtin/pack-objects.c:2885 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant" +msgstr "" +"longitud màxima de la cadena de diferències permesa en el paquet resultant" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2887 msgid "reuse existing deltas" -msgstr "reusa les deltes existents" +msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2889 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2891 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2893 msgid "use threads when searching for best delta matches" -msgstr "usa fils en cercar les millores coincidències de delta" +msgstr "usa fils en cercar les millores coincidències de diferències" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2895 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2897 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2899 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2820 +#: builtin/pack-objects.c:2902 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2905 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:2826 +#: builtin/pack-objects.c:2908 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2911 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2831 +#: builtin/pack-objects.c:2913 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2915 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2917 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:2837 +#: builtin/pack-objects.c:2919 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2840 +#: builtin/pack-objects.c:2922 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2842 +#: builtin/pack-objects.c:2924 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:2844 +#: builtin/pack-objects.c:2926 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2928 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2848 +#: builtin/pack-objects.c:2930 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2850 +#: builtin/pack-objects.c:2932 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un índex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2934 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3061 msgid "Counting objects" msgstr "S'estan comptant els objectes" @@ -10940,7 +11187,7 @@ msgstr "Opcions relacionades amb fusionar" msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora els canvis per rebasar en lloc de fusionar" -#: builtin/pull.c:148 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 msgid "allow fast-forward" msgstr "permet l'avanç ràpid" @@ -11015,7 +11262,7 @@ msgstr "Vegeu git-pull(1) per detalls." msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" @@ -11230,7 +11477,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "S'han rebutjat les actualitzacions perquè el remot conté treball\n" -"que no teniu localment. Això usualment és causat per un altre dipòsit\n" +"que no teniu localment. Això acostumar a ser causat per un altre dipòsit\n" "que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n" "integrar els canvis remots (per exemple, 'git pull ...') abans de\n" "pujar de nou.\n" @@ -11313,11 +11560,11 @@ msgstr "--all i --mirror són incompatibles" msgid "repository" msgstr "dipòsit" -#: builtin/push.c:519 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:162 msgid "push all refs" msgstr "puja totes les referències" -#: builtin/push.c:520 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:164 msgid "mirror all refs" msgstr "reflecteix totes les referències" @@ -11329,15 +11576,15 @@ msgstr "suprimeix les referències" msgid "push tags (can't be used with --all or --mirror)" msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:526 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:165 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:528 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:179 msgid "refname>:<expect" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:529 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" @@ -11345,12 +11592,12 @@ msgstr "requereix que el valor antic de la referència sigui d'aquest valor" msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:534 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:173 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 -#: builtin/send-pack.c:159 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 +#: builtin/send-pack.c:160 msgid "receive pack program" msgstr "programa que rep els paquets" @@ -11370,19 +11617,19 @@ msgstr "evita el ganxo de prepujada" msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:546 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:167 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:548 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:174 msgid "request atomic transaction on remote side" msgstr "demana una transacció atòmica al costat remot" -#: builtin/push.c:549 +#: builtin/push.c:549 builtin/send-pack.c:170 msgid "server-specific" msgstr "específic al servidor" -#: builtin/push.c:549 +#: builtin/push.c:549 builtin/send-pack.c:171 msgid "option to transmit" msgstr "opció a transmetre" @@ -11398,7 +11645,7 @@ msgstr "--delete no té sentit sense referències" msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir caràcters de línia nova" -#: builtin/read-tree.c:37 +#: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -11408,75 +11655,87 @@ msgstr "" "[-u [--exclude-per-directory=<ignoral-de-git>] | -i]] [--no-sparse-checkout] " "[--index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])" -#: builtin/read-tree.c:110 +#: builtin/read-tree.c:130 msgid "write resulting index to <file>" msgstr "escriu l'índex resultant al <fitxer>" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:133 msgid "only empty the index" msgstr "només buida l'índex" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:135 msgid "Merging" msgstr "S'està fusionant" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:137 msgid "perform a merge in addition to a read" msgstr "realitza una fusió a més d'una lectura" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:139 msgid "3-way merge if no file level merging required" msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:141 msgid "3-way merge in presence of adds and removes" msgstr "fusió de 3 vies en presència d'afegiments i eliminacions" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:143 msgid "same as -m, but discard unmerged entries" msgstr "el mateix que -m, però descarta les entrades no fusionades" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:144 msgid "<subdirectory>/" msgstr "<subdirectori>/" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:145 msgid "read the tree into the index under <subdirectory>/" msgstr "llegiu l'arbre a l'índex sota <subdirectori>/" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:148 msgid "update working tree with merge result" msgstr "actualitza l'arbre de treball amb el resultat de fusió" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:150 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:151 msgid "allow explicitly ignored files to be overwritten" msgstr "permet que els fitxers explícitament ignorats se sobreescriguin" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:154 msgid "don't check the working tree after merging" msgstr "no comprovis l'arbre de treball després de fusionar" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:155 msgid "don't update the index or the work tree" msgstr "no actualitzis l'índex ni l'arbre de treball" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:157 msgid "skip applying sparse checkout filter" msgstr "omet l'aplicació del filtre d'agafament parcial" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:159 msgid "debug unpack-trees" msgstr "depura unpack-trees" -#: builtin/receive-pack.c:26 +#: builtin/rebase--helper.c:7 +msgid "git rebase--helper [<options>]" +msgstr "git rebase--helper [<opcions>]" + +#: builtin/rebase--helper.c:19 +msgid "continue rebase" +msgstr "continua el «rebase»" + +#: builtin/rebase--helper.c:21 +msgid "abort rebase" +msgstr "avorta el «rebase»" + +#: builtin/receive-pack.c:27 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:793 +#: builtin/receive-pack.c:795 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" @@ -11507,7 +11766,7 @@ msgstr "" "predeterminat, establiu la variable de configuració\n" "'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:813 +#: builtin/receive-pack.c:815 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" @@ -11529,11 +11788,11 @@ msgstr "" "\n" "Per a silenciar aquest missatge, podeu establir-la a 'refuse'." -#: builtin/receive-pack.c:1883 +#: builtin/receive-pack.c:1888 msgid "quiet" msgstr "silenciós" -#: builtin/receive-pack.c:1897 +#: builtin/receive-pack.c:1902 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." @@ -11714,7 +11973,7 @@ msgstr "(coincident)" msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 #, c-format msgid "No such remote: %s" msgstr "No hi ha tal remot: %s" @@ -11746,7 +12005,7 @@ msgstr "la supressió de '%s' ha fallat" msgid "creating '%s' failed" msgstr "la creació de '%s' ha fallat" -#: builtin/remote.c:792 +#: builtin/remote.c:794 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11761,299 +12020,299 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:806 +#: builtin/remote.c:808 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració '%s'" -#: builtin/remote.c:907 +#: builtin/remote.c:909 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)" -#: builtin/remote.c:910 +#: builtin/remote.c:912 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:912 +#: builtin/remote.c:914 msgid " stale (use 'git remote prune' to remove)" msgstr " estancat (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:914 +#: builtin/remote.c:916 msgid " ???" msgstr " ???" -#: builtin/remote.c:955 +#: builtin/remote.c:957 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca" -#: builtin/remote.c:963 +#: builtin/remote.c:965 #, c-format msgid "rebases interactively onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:964 +#: builtin/remote.c:966 #, c-format msgid "rebases onto remote %s" msgstr "es fa «rebase» sobre el remot %s" -#: builtin/remote.c:967 +#: builtin/remote.c:969 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:970 +#: builtin/remote.c:972 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:973 +#: builtin/remote.c:975 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s i amb el remot %s\n" -#: builtin/remote.c:1016 +#: builtin/remote.c:1018 msgid "create" msgstr "crea" -#: builtin/remote.c:1019 +#: builtin/remote.c:1021 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1023 +#: builtin/remote.c:1025 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1026 +#: builtin/remote.c:1028 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1029 +#: builtin/remote.c:1031 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1036 +#: builtin/remote.c:1038 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1039 +#: builtin/remote.c:1041 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1045 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1046 +#: builtin/remote.c:1048 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1114 +#: builtin/remote.c:1116 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1141 +#: builtin/remote.c:1143 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1142 +#: builtin/remote.c:1144 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obtenció: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 +#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 msgid "(no URL)" msgstr "(sense URL)" #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1154 builtin/remote.c:1156 +#: builtin/remote.c:1156 builtin/remote.c:1158 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1160 msgid "(not queried)" msgstr "(no consultat)" -#: builtin/remote.c:1160 +#: builtin/remote.c:1162 msgid "(unknown)" msgstr "(desconegut)" -#: builtin/remote.c:1164 +#: builtin/remote.c:1166 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" -#: builtin/remote.c:1176 +#: builtin/remote.c:1178 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1179 builtin/remote.c:1205 +#: builtin/remote.c:1181 builtin/remote.c:1207 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1188 +#: builtin/remote.c:1190 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branca local configurada per a 'git pull':" msgstr[1] " Branques locals configurades per a 'git pull':" -#: builtin/remote.c:1196 +#: builtin/remote.c:1198 msgid " Local refs will be mirrored by 'git push'" msgstr " 'git push' reflectirà les referències locals" -#: builtin/remote.c:1202 +#: builtin/remote.c:1204 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referència local configurada per a 'git push'%s:" msgstr[1] " Referències locals configurades per a 'git push'%s:" -#: builtin/remote.c:1223 +#: builtin/remote.c:1225 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1225 +#: builtin/remote.c:1227 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1240 +#: builtin/remote.c:1242 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar el HEAD remot" -#: builtin/remote.c:1242 +#: builtin/remote.c:1244 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament " "amb:" -#: builtin/remote.c:1252 +#: builtin/remote.c:1254 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1260 +#: builtin/remote.c:1262 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1264 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1280 +#: builtin/remote.c:1282 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1283 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1291 +#: builtin/remote.c:1293 #, c-format msgid "Pruning %s" msgstr "S'està podant %s" -#: builtin/remote.c:1292 +#: builtin/remote.c:1294 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1308 +#: builtin/remote.c:1310 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1313 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1358 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 +#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot '%s'" -#: builtin/remote.c:1435 +#: builtin/remote.c:1437 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1442 +#: builtin/remote.c:1444 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1459 +#: builtin/remote.c:1461 msgid "query push URLs rather than fetch URLs" msgstr "consulta els URL de pujada en lloc dels URL d'obtenció" -#: builtin/remote.c:1461 +#: builtin/remote.c:1463 msgid "return all URLs" msgstr "retorna tots els URL" -#: builtin/remote.c:1489 +#: builtin/remote.c:1491 #, c-format msgid "no URLs configured for remote '%s'" msgstr "cap URL configurat per al remot '%s'" -#: builtin/remote.c:1515 +#: builtin/remote.c:1517 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1517 +#: builtin/remote.c:1519 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "delete URLs" msgstr "suprimeix URLs" -#: builtin/remote.c:1526 +#: builtin/remote.c:1528 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1567 +#: builtin/remote.c:1569 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no vàlid: %s" -#: builtin/remote.c:1575 +#: builtin/remote.c:1577 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1579 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: builtin/remote.c:1591 +#: builtin/remote.c:1593 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" -#: builtin/remote.c:1622 +#: builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconeguda: %s" @@ -12114,7 +12373,7 @@ msgstr "amb -a, reempaqueta els objectes inabastables" #: builtin/repack.c:188 msgid "size of the window used for delta compression" -msgstr "mida de la finestra que s'usa per a compressió de deltes" +msgstr "mida de la finestra que s'usa per a compressió de diferències" #: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" @@ -12128,7 +12387,7 @@ msgstr "" #: builtin/repack.c:192 msgid "limits the maximum delta depth" -msgstr "limita la profunditat màxima de les deltes" +msgstr "limita la profunditat màxima de les diferències" #: builtin/repack.c:194 msgid "maximum size of each packfile" @@ -12171,22 +12430,22 @@ msgstr "git replace -d <objecte>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<patró>]]" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "No és un nom d'objecte vàlid: '%s'" -#: builtin/replace.c:355 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusió dolenta en la comissió '%s'" -#: builtin/replace.c:357 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusió mal formada en la comissió '%s'" -#: builtin/replace.c:368 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12195,45 +12454,45 @@ msgstr "" "la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; " "useu --edit en lloc de --graft" -#: builtin/replace.c:401 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "la comissió original '%s' té una signatura gpg." -#: builtin/replace.c:402 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "s'eliminarà la signatura en la comissió de reemplaçament!" -#: builtin/replace.c:408 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'" -#: builtin/replace.c:432 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "llista les referències reemplaçades" -#: builtin/replace.c:433 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "suprimeix les referències reemplaçades" -#: builtin/replace.c:434 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:435 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "canvia les mares d'una comissió" -#: builtin/replace.c:436 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "reemplaça la referència si existeix" -#: builtin/replace.c:437 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:438 +#: builtin/replace.c:443 msgid "use this format" msgstr "usa aquest format" @@ -12377,23 +12636,23 @@ msgstr "No s'ha pogut escriure el fitxer d'índex nou." msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:393 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:398 msgid "keep the `--` passed as an arg" msgstr "retén el `--` passat com a paràmetre" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:400 msgid "stop parsing after the first non-option argument" msgstr "deixa d'analitzar després del primer paràmetre no d'opció" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:403 msgid "output in stuck long form" msgstr "emet en forma llarga enganxada" -#: builtin/rev-parse.c:532 +#: builtin/rev-parse.c:534 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12424,68 +12683,72 @@ msgstr "git cherry-pick [<opcions>] <comissió>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <subordre>" -#: builtin/revert.c:71 +#: builtin/revert.c:89 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s no es pot usar amb %s" -#: builtin/revert.c:80 +#: builtin/revert.c:98 msgid "end revert or cherry-pick sequence" msgstr "acaba la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:81 +#: builtin/revert.c:99 msgid "resume revert or cherry-pick sequence" msgstr "reprèn la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:82 +#: builtin/revert.c:100 msgid "cancel revert or cherry-pick sequence" msgstr "cancel·la la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:83 +#: builtin/revert.c:101 msgid "don't automatically commit" msgstr "no cometis automàticament" -#: builtin/revert.c:84 +#: builtin/revert.c:102 msgid "edit the commit message" msgstr "edita el missatge de comissió" -#: builtin/revert.c:87 -msgid "parent number" -msgstr "número de mare" +#: builtin/revert.c:105 +msgid "parent-number" +msgstr "número del pare" -#: builtin/revert.c:89 +#: builtin/revert.c:106 +msgid "select mainline parent" +msgstr "selecciona la línia principal del pare" + +#: builtin/revert.c:108 msgid "merge strategy" msgstr "estratègia de fusió" -#: builtin/revert.c:90 +#: builtin/revert.c:109 msgid "option" msgstr "opció" -#: builtin/revert.c:91 +#: builtin/revert.c:110 msgid "option for merge strategy" msgstr "opció d'estratègia de fusió" -#: builtin/revert.c:100 +#: builtin/revert.c:119 msgid "append commit name" msgstr "nom de la comissió a annexar" -#: builtin/revert.c:102 +#: builtin/revert.c:121 msgid "preserve initially empty commits" msgstr "preserva les comissions inicialment buides" -#: builtin/revert.c:103 +#: builtin/revert.c:122 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/revert.c:104 +#: builtin/revert.c:123 msgid "keep redundant, empty commits" msgstr "retén les comissions redundants i buides" -#: builtin/revert.c:192 +#: builtin/revert.c:211 msgid "revert failed" msgstr "la reversió ha fallat" -#: builtin/revert.c:205 +#: builtin/revert.c:224 msgid "cherry-pick failed" msgstr "el «cherry pick» ha fallat" @@ -12582,19 +12845,19 @@ msgstr "" "[<màquina>:]<directori> [<referència>...]\n" " --all i especificació <referència> explícita són mutualment exclusius." -#: builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "remote name" msgstr "nom del remot" -#: builtin/send-pack.c:171 +#: builtin/send-pack.c:175 msgid "use stateless RPC protocol" msgstr "usa el protocol RPC sense estat" -#: builtin/send-pack.c:172 +#: builtin/send-pack.c:176 msgid "read refs from stdin" msgstr "llegeix les referències des d'stdin" -#: builtin/send-pack.c:173 +#: builtin/send-pack.c:177 msgid "print status from remote helper" msgstr "imprimeix l'estat des de l'ajudant remot" @@ -12602,28 +12865,28 @@ msgstr "imprimeix l'estat des de l'ajudant remot" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:248 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:250 msgid "sort output according to the number of commits per author" msgstr "ordena la sortida segons el nombre de comissions per autor" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:252 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Omet les descripcions de comissió, només proveeix el recompte de comissions" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:254 msgid "Show the email address of each author" msgstr "Mostra l'adreça de correu electrònic de cada autor" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:255 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:256 msgid "Linewrap output" msgstr "Ajusta les línies de la sortida" @@ -12643,121 +12906,121 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" -#: builtin/show-branch.c:375 +#: builtin/show-branch.c:374 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència" msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències" -#: builtin/show-branch.c:541 +#: builtin/show-branch.c:536 #, c-format msgid "no matching refs with %s" msgstr "no hi ha referències coincidents amb %s" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:632 msgid "show remote-tracking and local branches" msgstr "mostra les branques amb seguiment remot i les locals" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:634 msgid "show remote-tracking branches" msgstr "mostra les branques amb seguiment remot" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:636 msgid "color '*!+-' corresponding to the branch" msgstr "colora '*!+-' corresponent a la branca" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:638 msgid "show <n> more commits after the common ancestor" msgstr "mostra <n> comissions després de l'avantpassat comú" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:640 msgid "synonym to more=-1" msgstr "sinònim de more=-1" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:641 msgid "suppress naming strings" msgstr "omet l'anomenament de cadenes" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:643 msgid "include the current branch" msgstr "inclou la branca actual" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:645 msgid "name commits with their object names" msgstr "anomena les comissions amb els seus noms d'objecte" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:647 msgid "show possible merge bases" msgstr "mostra les bases de fusió possibles" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:649 msgid "show refs unreachable from any other ref" msgstr "mostra les referències inabastables de qualsevol altra referència" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:651 msgid "show commits in topological order" msgstr "mostra les comissions en ordre topològic" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:654 msgid "show only commits not on the first branch" msgstr "mostra només les comissions que no siguin en la primera branca" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:656 msgid "show merges reachable from only one tip" msgstr "mostra les fusions abastables de només una punta" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:658 msgid "topologically sort, maintaining date order where possible" msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:661 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:662 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostra les <n> entrades més recents començant a la base" -#: builtin/show-branch.c:703 +#: builtin/show-branch.c:696 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog és incompatible amb --all, --remotes, --independent o --merge-base" -#: builtin/show-branch.c:727 +#: builtin/show-branch.c:720 msgid "no branches given, and HEAD is not valid" msgstr "no s'ha donat cap branca, i HEAD no és vàlid" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:723 msgid "--reflog option needs one branch name" msgstr "l'opció --reflog necessita un nom de branca" -#: builtin/show-branch.c:733 +#: builtin/show-branch.c:726 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "es pot mostrar només %d entrada a la vegada." msgstr[1] "es poden mostrar només %d entrades a la vegada." -#: builtin/show-branch.c:737 +#: builtin/show-branch.c:730 #, c-format msgid "no such ref %s" msgstr "no hi ha tal referència %s" -#: builtin/show-branch.c:829 +#: builtin/show-branch.c:814 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "no es pot gestionar més d'%d revisió." msgstr[1] "no es poden gestionar més de %d revisions." -#: builtin/show-branch.c:833 +#: builtin/show-branch.c:818 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' no és una referència vàlida." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:821 #, c-format msgid "cannot find commit %s (%s)" msgstr "no es pot trobar la comissió %s (%s)" @@ -12825,12 +13088,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteposa el caràcter de comentari i un espai a cada línia" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" @@ -12840,96 +13103,103 @@ msgstr "S'espera un nom de referència ple, s'ha rebut %s" msgid "cannot strip one component off url '%s'" msgstr "no es pot despullar un component de l'url '%s'" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 msgid "alternative anchor for relative paths" msgstr "àncora alternativa per als camins relatius" -#: builtin/submodule--helper.c:287 +#: builtin/submodule--helper.c:310 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No s'ha trobat cap url per al camí de submòdul '%s' a .gitmodules" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:395 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" + +#: builtin/submodule--helper.c:406 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "S'ha produït un error en registrar l'url per al camí de submòdul '%s'" -#: builtin/submodule--helper.c:377 +#: builtin/submodule--helper.c:410 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "S'ha registrat el submòdul '%s' (%s) per al camí '%s'\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:420 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "advertència: se suggereix el mode d'actualització per ordre per al submòdul " "'%s'\n" -#: builtin/submodule--helper.c:394 +#: builtin/submodule--helper.c:427 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "S'ha produït un error en registrar el mode d'actualització per al camí de " "submòdul '%s'" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:443 msgid "Suppress output for initializing a submodule" msgstr "Omet la sortida d'inicialitzar un submòdul" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:448 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<camí>]" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:476 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <camí>" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:482 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '%s'" -#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submòdul '%s' no pot afegir un alternatiu: %s" -#: builtin/submodule--helper.c:564 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "No es reconeix el valor '%s' per a submodule.alternateErrorStrategy" -#: builtin/submodule--helper.c:571 +#: builtin/submodule--helper.c:611 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "No es reconeix el valor '%s' per a submodule.alternateLocation" -#: builtin/submodule--helper.c:595 +#: builtin/submodule--helper.c:633 msgid "where the new submodule will be cloned to" msgstr "a on es clonarà el submòdul nou" -#: builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:636 msgid "name of the new submodule" msgstr "nom del submòdul nou" -#: builtin/submodule--helper.c:601 +#: builtin/submodule--helper.c:639 msgid "url where to clone the submodule from" msgstr "url del qual clonar el submòdul" -#: builtin/submodule--helper.c:607 +#: builtin/submodule--helper.c:645 msgid "depth for shallow clones" msgstr "profunditat dels clons superficials" -#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 +#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 msgid "force cloning progress" msgstr "força el progrés del clonatge" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:653 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12937,92 +13207,82 @@ msgstr "" "git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference " "<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:684 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat" -#: builtin/submodule--helper.c:662 -#, c-format -msgid "cannot open file '%s'" -msgstr "no es pot obrir el fitxer '%s'" - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "could not close file %s" -msgstr "no s'ha pogut tancar el fitxer %s" - -#: builtin/submodule--helper.c:674 +#: builtin/submodule--helper.c:699 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:764 #, c-format msgid "Submodule path '%s' not initialized" msgstr "El camí de submòdul '%s' no està inicialitzat" -#: builtin/submodule--helper.c:746 +#: builtin/submodule--helper.c:768 msgid "Maybe you want to use 'update --init'?" msgstr "Potser voleu usar 'update --init'?" -#: builtin/submodule--helper.c:772 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping unmerged submodule %s" msgstr "S'està ometent el submòdul no fusionat %s" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:814 #, c-format msgid "Skipping submodule '%s'" msgstr "S'està ometent el submòdul '%s'" -#: builtin/submodule--helper.c:929 +#: builtin/submodule--helper.c:942 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "S'ha produït un error en clonar '%s'. S'ha programat un reintent" -#: builtin/submodule--helper.c:940 +#: builtin/submodule--helper.c:953 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "S'ha produït un error per segon cop en clonar '%s', s'està avortant" -#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 +#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 msgid "path into the working tree" msgstr "camí a l'arbre de treball" -#: builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:977 msgid "path into the working tree, across nested submodule boundaries" msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:981 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:972 +#: builtin/submodule--helper.c:985 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:988 msgid "parallel jobs" msgstr "tasques paral·leles" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:990 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:991 msgid "don't print cloning progress" msgstr "no imprimeixis el progrés del clonatge" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:998 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:995 +#: builtin/submodule--helper.c:1008 msgid "bad value for update parameter" msgstr "valor dolent per al paràmetre update" -#: builtin/submodule--helper.c:1066 +#: builtin/submodule--helper.c:1079 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13031,24 +13291,24 @@ msgstr "" "La branca de submòdul (%s) està configurada per a heretar la branca del " "superprojecte, però el superprojecte no és en cap branca" -#: builtin/submodule--helper.c:1106 +#: builtin/submodule--helper.c:1163 msgid "recurse into submodules" msgstr "inclou recursivament als submòduls" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1169 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<camí>]" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1226 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "s'ha d'executar la subordre submodule--helper amb una subordre" -#: builtin/submodule--helper.c:1164 +#: builtin/submodule--helper.c:1233 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#: builtin/submodule--helper.c:1170 +#: builtin/submodule--helper.c:1239 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no és una subordre vàlida de submodule--helper" @@ -13094,8 +13354,10 @@ msgid "git tag -d <tagname>..." msgstr "git tag -d <nom-d'etiqueta>..." #: builtin/tag.c:25 +#, fuzzy msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" "git tag -l [-n[<nombre>]] [--contains <comissió>]\n" @@ -13106,22 +13368,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..." -#: builtin/tag.c:82 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "nom d'etiqueta massa llarg: %.*s..." - -#: builtin/tag.c:87 +#: builtin/tag.c:83 #, c-format msgid "tag '%s' not found." msgstr "no s'ha trobat l'etiqueta '%s'." -#: builtin/tag.c:102 +#: builtin/tag.c:99 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:128 #, c-format msgid "" "\n" @@ -13134,7 +13391,7 @@ msgstr "" " %s\n" "Les línies que comencin amb '%c' s'ignoraran.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:132 #, c-format msgid "" "\n" @@ -13149,138 +13406,142 @@ msgstr "" "Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós " "mateix si voleu.\n" -#: builtin/tag.c:213 +#: builtin/tag.c:210 msgid "unable to sign the tag" msgstr "no s'ha pogut signar l'etiqueta" -#: builtin/tag.c:215 +#: builtin/tag.c:212 msgid "unable to write tag file" msgstr "no s'ha pogut escriure el fitxer d'etiqueta" -#: builtin/tag.c:240 +#: builtin/tag.c:236 msgid "bad object type." msgstr "el tipus d'objecte és dolent." -#: builtin/tag.c:253 -msgid "tag header too big." -msgstr "la capçalera d'etiqueta és massa gran." - -#: builtin/tag.c:289 +#: builtin/tag.c:282 msgid "no tag message?" msgstr "no hi ha cap missatge d'etiqueta?" -#: builtin/tag.c:295 +#: builtin/tag.c:289 #, c-format msgid "The tag message has been left in %s\n" msgstr "S'ha deixat el missatge de l'etiqueta en %s\n" -#: builtin/tag.c:354 +#: builtin/tag.c:397 msgid "list tag names" msgstr "llista els noms d'etiqueta" -#: builtin/tag.c:356 +#: builtin/tag.c:399 msgid "print <n> lines of each tag message" msgstr "imprimeix <n> línies de cada missatge d'etiqueta" -#: builtin/tag.c:358 +#: builtin/tag.c:401 msgid "delete tags" msgstr "suprimeix les etiquetes" -#: builtin/tag.c:359 +#: builtin/tag.c:402 msgid "verify tags" msgstr "verifica les etiquetes" -#: builtin/tag.c:361 +#: builtin/tag.c:404 msgid "Tag creation options" msgstr "Opcions de creació d'etiquetes" -#: builtin/tag.c:363 +#: builtin/tag.c:406 msgid "annotated tag, needs a message" msgstr "etiqueta anotada, necessita un missatge" -#: builtin/tag.c:365 +#: builtin/tag.c:408 msgid "tag message" msgstr "missatge d'etiqueta" -#: builtin/tag.c:367 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "etiqueta anotada i signada per GPG" -#: builtin/tag.c:371 +#: builtin/tag.c:414 msgid "use another key to sign the tag" msgstr "usa una altra clau per a signar l'etiqueta" -#: builtin/tag.c:372 +#: builtin/tag.c:415 msgid "replace the tag if exists" msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:373 builtin/update-ref.c:368 +#: builtin/tag.c:416 builtin/update-ref.c:368 msgid "create a reflog" msgstr "crea un registre de referències" -#: builtin/tag.c:375 +#: builtin/tag.c:418 msgid "Tag listing options" msgstr "Opcions de llistat d'etiquetes" -#: builtin/tag.c:376 +#: builtin/tag.c:419 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:377 builtin/tag.c:378 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" -#: builtin/tag.c:379 +#: builtin/tag.c:421 builtin/tag.c:423 +msgid "print only tags that don't contain the commit" +msgstr "imprimeix només les etiquetes que no continguin la comissió" + +#: builtin/tag.c:424 msgid "print only tags that are merged" msgstr "imprimeix només les etiquetes que s'han fusionat" -#: builtin/tag.c:380 +#: builtin/tag.c:425 msgid "print only tags that are not merged" msgstr "imprimeix només les etiquetes que no s'han fusionat" -#: builtin/tag.c:385 +#: builtin/tag.c:430 msgid "print only tags of the object" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/tag.c:415 +#: builtin/tag.c:469 msgid "--column and -n are incompatible" msgstr "--column i -n són incompatibles" -#: builtin/tag.c:437 -msgid "-n option is only allowed with -l." -msgstr "es permet l'opció -n només amb -l." +#: builtin/tag.c:491 +msgid "-n option is only allowed in list mode" +msgstr "es permet l'opció -n només amb mode llista" + +#: builtin/tag.c:493 +msgid "--contains option is only allowed in list mode" +msgstr "es permet l'opció --contains només amb mode llista" -#: builtin/tag.c:439 -msgid "--contains option is only allowed with -l." -msgstr "es permet l'opció --contains només amb -l." +#: builtin/tag.c:495 +msgid "--no-contains option is only allowed in list mode" +msgstr "es permet l'opció --no-contains només amb mode llista" -#: builtin/tag.c:441 -msgid "--points-at option is only allowed with -l." -msgstr "es permet --points-at option només amb -l." +#: builtin/tag.c:497 +msgid "--points-at option is only allowed in list mode" +msgstr "es permet --points-at option només amb mode llista" -#: builtin/tag.c:443 -msgid "--merged and --no-merged option are only allowed with -l" -msgstr "es permeten les opcions --merged i --no-merged només amb -l" +#: builtin/tag.c:499 +msgid "--merged and --no-merged options are only allowed in list mode" +msgstr "es permeten les opcions --merged i --no-merged només amb mode llista" -#: builtin/tag.c:454 +#: builtin/tag.c:510 msgid "only one -F or -m option is allowed." msgstr "només es permet una opció -F o -m." -#: builtin/tag.c:473 +#: builtin/tag.c:529 msgid "too many params" msgstr "massa paràmetres" -#: builtin/tag.c:479 +#: builtin/tag.c:535 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no és un nom d'etiqueta vàlid." -#: builtin/tag.c:484 +#: builtin/tag.c:540 #, c-format msgid "tag '%s' already exists" msgstr "l'etiqueta '%s' ja existeix" -#: builtin/tag.c:512 +#: builtin/tag.c:570 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualitzada (era %s)\n" @@ -13309,189 +13570,205 @@ msgstr "s'ha produït un error en crear el fitxer %s" msgid "failed to delete file %s" msgstr "s'ha produït un error en suprimir el fitxer %s" -#: builtin/update-index.c:110 builtin/update-index.c:212 +#: builtin/update-index.c:110 builtin/update-index.c:216 #, c-format msgid "failed to delete directory %s" msgstr "s'ha produït un error en suprimir el directori %s" -#: builtin/update-index.c:133 +#: builtin/update-index.c:135 #, c-format msgid "Testing mtime in '%s' " msgstr "S'està provant mtime en '%s' " -#: builtin/update-index.c:145 +#: builtin/update-index.c:149 msgid "directory stat info does not change after adding a new file" msgstr "" "la informació d'stat de directori no canvia després d'afegir un fitxer nou" -#: builtin/update-index.c:158 +#: builtin/update-index.c:162 msgid "directory stat info does not change after adding a new directory" msgstr "" "la informació d'stat de directori no canvia després d'afegir un directori nou" -#: builtin/update-index.c:171 +#: builtin/update-index.c:175 msgid "directory stat info changes after updating a file" msgstr "" "la informació d'stat de directori canvia després d'actualitzar un fitxer" -#: builtin/update-index.c:182 +#: builtin/update-index.c:186 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "la informació d'stat de directori canvia després d'afegir un fitxer dins " "d'un subdirectori" -#: builtin/update-index.c:193 +#: builtin/update-index.c:197 msgid "directory stat info does not change after deleting a file" msgstr "" "la informació d'stat de directori no canvia després de suprimir un fitxer" -#: builtin/update-index.c:206 +#: builtin/update-index.c:210 msgid "directory stat info does not change after deleting a directory" msgstr "" "la informació d'stat de directori no canvia després de suprimir un directori" -#: builtin/update-index.c:213 +#: builtin/update-index.c:217 msgid " OK" msgstr " D'acord" -#: builtin/update-index.c:564 +#: builtin/update-index.c:568 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:919 +#: builtin/update-index.c:923 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualització encara que l'índex necessiti una actualització" -#: builtin/update-index.c:922 +#: builtin/update-index.c:926 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:925 +#: builtin/update-index.c:929 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:927 +#: builtin/update-index.c:931 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:929 +#: builtin/update-index.c:933 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:931 +#: builtin/update-index.c:935 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'índex contingui entrades no fusionades" -#: builtin/update-index.c:934 +#: builtin/update-index.c:938 msgid "refresh stat information" msgstr "actualitza la informació d'estadístiques" -#: builtin/update-index.c:938 +#: builtin/update-index.c:942 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora l'ajust assume-unchanged" -#: builtin/update-index.c:942 +#: builtin/update-index.c:946 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camí>" -#: builtin/update-index.c:943 +#: builtin/update-index.c:947 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'índex" -#: builtin/update-index.c:952 +#: builtin/update-index.c:956 msgid "mark files as \"not changing\"" msgstr "marca els fitxers com a \"no canviant\"" -#: builtin/update-index.c:955 +#: builtin/update-index.c:959 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:958 +#: builtin/update-index.c:962 msgid "mark files as \"index-only\"" msgstr "marca els fitxers com a \"només índex\"" -#: builtin/update-index.c:961 +#: builtin/update-index.c:965 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:964 +#: builtin/update-index.c:968 msgid "add to index only; do not add content to object database" msgstr "" "només afegeix a l'índex; no afegeixis el contingut a la base de dades " "d'objectes" -#: builtin/update-index.c:966 +#: builtin/update-index.c:970 msgid "remove named paths even if present in worktree" msgstr "" "elimina els camins anomenats encara que estiguin presents en l'arbre de " "treball" -#: builtin/update-index.c:968 +#: builtin/update-index.c:972 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls" -#: builtin/update-index.c:970 +#: builtin/update-index.c:974 msgid "read list of paths to be updated from standard input" msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard" -#: builtin/update-index.c:974 +#: builtin/update-index.c:978 msgid "add entries from standard input to the index" msgstr "afegeix les entrades de l'entrada estàndard a l'índex" -#: builtin/update-index.c:978 +#: builtin/update-index.c:982 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les «stage» #2 i #3 per als camins llistats" -#: builtin/update-index.c:982 +#: builtin/update-index.c:986 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:986 +#: builtin/update-index.c:990 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:989 +#: builtin/update-index.c:993 msgid "report actions to standard output" msgstr "informa de les accions en la sortida estàndard" -#: builtin/update-index.c:991 +#: builtin/update-index.c:995 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:995 +#: builtin/update-index.c:999 msgid "write index in this format" msgstr "escriu l'índex en aquest format" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1001 msgid "enable or disable split index" msgstr "habilita o inhabilita l'índex dividit" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1003 msgid "enable/disable untracked cache" msgstr "habilita/inhabilita la memòria cau no seguida" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1005 msgid "test if the filesystem supports untracked cache" msgstr "prova si el sistema de fitxers admet la memòria cau no seguida" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1007 msgid "enable untracked cache without testing the filesystem" msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers" -#: builtin/update-index.c:1120 +#: builtin/update-index.c:1107 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si " +"realment voleu habilitar l'index dividit" + +#: builtin/update-index.c:1116 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si " +"realment voleu inhabilitar l'index dividit" + +#: builtin/update-index.c:1127 msgid "" -"core.untrackedCache is set to true; remove or change it, if you really want " +"core.untrackedCache is set to true; remove or change it, if you e want " "to disable the untracked cache" msgstr "" -"core.untrackedCache està establert a veritable; elimineu-lo o canvieu-lo, si " +"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si " "realment voleu inhabilitar el cau no seguit" -#: builtin/update-index.c:1124 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "La memòria cau no seguida està inhabilitada" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13499,7 +13776,7 @@ msgstr "" "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " "realment voleu habilitar el cau no seguit" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "La memòria cau no seguida està habilitada per a '%s'" @@ -13593,27 +13870,27 @@ msgstr "git worktree prune [<opcions>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <camí>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:43 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Eliminació de worktrees/%s: no és un directori vàlid" -#: builtin/worktree.c:48 +#: builtin/worktree.c:49 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix" -#: builtin/worktree.c:53 +#: builtin/worktree.c:54 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" -#: builtin/worktree.c:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid" -#: builtin/worktree.c:80 +#: builtin/worktree.c:81 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" @@ -13633,60 +13910,64 @@ msgstr "fes caducar els arbres de treball més vells que <hora>" msgid "'%s' already exists" msgstr "'%s' ja existeix" -#: builtin/worktree.c:236 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "no s'ha pogut crear directori de '%s'" -#: builtin/worktree.c:272 +#: builtin/worktree.c:274 #, c-format msgid "Preparing %s (identifier %s)" msgstr "S'està preparant %s (identificador %s)" -#: builtin/worktree.c:323 +#: builtin/worktree.c:328 msgid "checkout <branch> even if already checked out in other worktree" msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball" -#: builtin/worktree.c:325 +#: builtin/worktree.c:330 msgid "create a new branch" msgstr "crea una branca nova" -#: builtin/worktree.c:327 +#: builtin/worktree.c:332 msgid "create or reset a branch" msgstr "crea o restableix una branca" -#: builtin/worktree.c:329 +#: builtin/worktree.c:334 msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" -#: builtin/worktree.c:337 +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" +msgstr "mantén l'arbre de treball nou bloquejat" + +#: builtin/worktree.c:343 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach són mutualment exclusius" -#: builtin/worktree.c:472 +#: builtin/worktree.c:478 msgid "reason for locking" msgstr "raó per bloquejar" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:490 builtin/worktree.c:523 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no és un arbre de treball" -#: builtin/worktree.c:486 builtin/worktree.c:519 +#: builtin/worktree.c:492 builtin/worktree.c:525 msgid "The main working tree cannot be locked or unlocked" msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal" -#: builtin/worktree.c:491 +#: builtin/worktree.c:497 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ja està bloquejat, raó: '%s'" -#: builtin/worktree.c:493 +#: builtin/worktree.c:499 #, c-format msgid "'%s' is already locked" msgstr "'%s' ja està bloquejat" -#: builtin/worktree.c:521 +#: builtin/worktree.c:527 #, c-format msgid "'%s' is not locked" msgstr "'%s' no està bloquejat" @@ -13711,20 +13992,20 @@ msgstr "només útil per a la depuració" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opcions>] <directori>" -#: upload-pack.c:1036 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "surt després d'un sol intercanvi de sol·licitud/resposta" -#: upload-pack.c:1038 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "surt immediatament després de l'anunci inicial de referència" -#: upload-pack.c:1040 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "no intentis <directori>/.git/ si <directori> no és cap directori del Git" -#: upload-pack.c:1042 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromp la transferència després de <n> segons d'inactivitat" @@ -13756,26 +14037,31 @@ msgstr "" "algunes guies de concepte. Vegeu 'git help <ordre>' o\n" "'git help <concepte>' per a llegir sobre una subordre o concepte específic." -#: http.c:344 +#: http.c:336 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "" + +#: http.c:357 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "No s'admet el control de delegació amb el cURL < 7.22.0" -#: http.c:353 +#: http.c:366 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0" -#: http.c:1713 +#: http.c:1766 #, c-format msgid "" "unable to update url base from redirection:\n" " asked for: %s\n" " redirect: %s" msgstr "" -"no s'ha pogut actualitzar la URL base des de la redirecció:\n" +"no s'ha pogut actualitzar l'URL base des de la redirecció:\n" " petició: %s\n" " redirecció: %s" -#: remote-curl.c:319 +#: remote-curl.c:323 #, c-format msgid "redirecting to %s" msgstr "s'està redirigint a %s" @@ -14151,7 +14437,7 @@ msgid "Simple merge did not work, trying automatic merge." msgstr "" "La fusió simple no ha funcionat, s'està intentant una fusió automàtica." -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -14164,37 +14450,37 @@ msgstr "" "Per a agafar la branca original i deixar de fer «rebase», executeu \"git " "rebase --abort\"." -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "No s'ha pogut tornar a $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "No es pot emmagatzemar $stash_sha1" -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "El ganxo pre-«rebase» ha refusat a fer «rebase»." -#: git-rebase.sh:216 +#: git-rebase.sh:217 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Sembla que git-am està en curs. No es pot fer «rebase»." -#: git-rebase.sh:357 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "No hi ha rebasament en curs?" -#: git-rebase.sh:368 +#: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu." -#: git-rebase.sh:375 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14202,7 +14488,7 @@ msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" "marcar-los com a resolts fent servir git add" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14223,103 +14509,103 @@ msgstr "" "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" "de valor." -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "font no vàlida $upstream_name" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ja hi ha més d'una base de fusió" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: no hi ha cap base de fusió" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "No assenyala una comissió vàlida: $onto_name" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: no hi ha tal branca: $branch_name" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "No es pot emmagatzemar automàticament" -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "Si us plau, cometeu-los o emmagatzemeu-los." -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branca actual $branch_name està al dia." -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branca actual $branch_name està al dia; «rebase» forçat." -#: git-rebase.sh:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Canvis de $mb a $onto:" -#: git-rebase.sh:614 +#: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Primer, s'està rebobinant el cap per a reproduir el vostre treball al " "damunt..." -#: git-rebase.sh:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "S'ha avançat $branch_name ràpidament a $onto_name." -#: git-stash.sh:50 +#: git-stash.sh:53 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear amb paràmetres no està implementat" -#: git-stash.sh:73 +#: git-stash.sh:94 msgid "You do not have the initial commit yet" msgstr "Encara no teniu la comissió inicial" -#: git-stash.sh:88 +#: git-stash.sh:109 msgid "Cannot save the current index state" msgstr "No es pot desar l'estat d'índex actual" -#: git-stash.sh:103 +#: git-stash.sh:124 msgid "Cannot save the untracked files" msgstr "No es pot desar els fitxers no seguits" -#: git-stash.sh:123 git-stash.sh:136 +#: git-stash.sh:144 git-stash.sh:157 msgid "Cannot save the current worktree state" msgstr "No es pot desar l'estat d'arbre de treball actual" -#: git-stash.sh:140 +#: git-stash.sh:161 msgid "No changes selected" msgstr "No hi ha canvis seleccionats" -#: git-stash.sh:143 +#: git-stash.sh:164 msgid "Cannot remove temporary index (can't happen)" msgstr "No es pot eliminar l'índex temporal (això no pot passar)" -#: git-stash.sh:156 +#: git-stash.sh:177 msgid "Cannot record working tree state" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: git-stash.sh:188 +#: git-stash.sh:209 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No es pot actualitzar $ref_stash amb $w_commit" @@ -14334,7 +14620,7 @@ msgstr "No es pot actualitzar $ref_stash amb $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:265 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14343,107 +14629,107 @@ msgstr "" "error: opció desconeguda de 'stash save': $option\n" " Per a proveir un missatge, useu git stash save -- '$option'" -#: git-stash.sh:251 +#: git-stash.sh:278 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No es poden usar --patch i --include-untracked o --all a la vegada." -#: git-stash.sh:259 +#: git-stash.sh:286 msgid "No local changes to save" msgstr "No hi ha canvis locals a desar" -#: git-stash.sh:263 +#: git-stash.sh:291 msgid "Cannot initialize stash" msgstr "No es pot inicialitzar el magatzem" -#: git-stash.sh:267 +#: git-stash.sh:295 msgid "Cannot save the current status" msgstr "No es pot desar l'estat actual" -#: git-stash.sh:268 +#: git-stash.sh:296 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg" -#: git-stash.sh:285 +#: git-stash.sh:323 msgid "Cannot remove worktree changes" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: git-stash.sh:403 +#: git-stash.sh:471 #, sh-format msgid "unknown option: $opt" msgstr "opció desconeguda: $opt" -#: git-stash.sh:416 +#: git-stash.sh:484 msgid "No stash found." msgstr "No s'ha trobat cap magatzem." -#: git-stash.sh:423 +#: git-stash.sh:491 #, sh-format msgid "Too many revisions specified: $REV" msgstr "S'han especificat massa revisions: $REV" -#: git-stash.sh:438 +#: git-stash.sh:506 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no és una referència vàlida" -#: git-stash.sh:466 +#: git-stash.sh:534 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no és una comissió de tipus magatzem" -#: git-stash.sh:477 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no és una referència de magatzem" -#: git-stash.sh:485 +#: git-stash.sh:553 msgid "unable to refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: git-stash.sh:489 +#: git-stash.sh:557 msgid "Cannot apply a stash in the middle of a merge" msgstr "No es pot aplicar un magatzem enmig d'una fusió" -#: git-stash.sh:497 +#: git-stash.sh:565 msgid "Conflicts in index. Try without --index." msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index." -#: git-stash.sh:499 +#: git-stash.sh:567 msgid "Could not save index tree" msgstr "No s'ha pogut desar l'arbre d'índex" -#: git-stash.sh:508 +#: git-stash.sh:576 msgid "Could not restore untracked files from stash" msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge" -#: git-stash.sh:533 +#: git-stash.sh:601 msgid "Cannot unstage modified files" msgstr "No es pot fer «unstage» dels fitxers modificats" -#: git-stash.sh:548 +#: git-stash.sh:616 msgid "Index was not unstashed." msgstr "L'índex no estava sense emmagatzemar." -#: git-stash.sh:562 +#: git-stash.sh:630 msgid "The stash is kept in case you need it again." msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada." -#: git-stash.sh:571 +#: git-stash.sh:639 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) descartada" -#: git-stash.sh:572 +#: git-stash.sh:640 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: git-stash.sh:580 +#: git-stash.sh:648 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: git-stash.sh:652 +#: git-stash.sh:727 msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" @@ -14533,28 +14819,28 @@ msgstr "S'ha produït un error en afegir el submòdul '$sm_path'" msgid "Failed to register submodule '$sm_path'" msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" -#: git-submodule.sh:327 +#: git-submodule.sh:341 #, sh-format msgid "Entering '$displaypath'" msgstr "S'està entrant '$displaypath'" -#: git-submodule.sh:347 +#: git-submodule.sh:361 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." -#: git-submodule.sh:418 +#: git-submodule.sh:432 #, sh-format msgid "pathspec and --all are incompatible" msgstr "--pathspec i --all són incompatibles" -#: git-submodule.sh:423 +#: git-submodule.sh:437 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls" -#: git-submodule.sh:443 +#: git-submodule.sh:457 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14563,7 +14849,7 @@ msgstr "" "L'arbre de treball de submòdul '$displaypath' conté un directori .git\n" "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" -#: git-submodule.sh:451 +#: git-submodule.sh:465 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -14572,38 +14858,38 @@ msgstr "" "L'arbre de treball de submòdul '$displaypath' conté modificacions locals; " "useu '-f' per a descartar-les" -#: git-submodule.sh:454 +#: git-submodule.sh:468 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "S'ha netejat el directori '$displaypath'" -#: git-submodule.sh:455 +#: git-submodule.sh:469 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'" -#: git-submodule.sh:458 +#: git-submodule.sh:472 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'" -#: git-submodule.sh:467 +#: git-submodule.sh:481 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'" -#: git-submodule.sh:623 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'" -#: git-submodule.sh:633 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'" -#: git-submodule.sh:638 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14612,12 +14898,12 @@ msgstr "" "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " "camí de submòdul '$sm_path'" -#: git-submodule.sh:656 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'" -#: git-submodule.sh:662 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14626,87 +14912,87 @@ msgstr "" "S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. " "L'obtenció directa d'aquella comissió ha fallat." -#: git-submodule.sh:669 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:670 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'" -#: git-submodule.sh:674 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:675 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'" -#: git-submodule.sh:680 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:681 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'" -#: git-submodule.sh:686 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'execució de '$command $sha1' ha fallat en el camí de submòdul " "'$displaypath'" -#: git-submodule.sh:687 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Camí de submòdul '$displaypath': '$command $sha1'" -#: git-submodule.sh:718 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "S'ha produït un error en recorre recursivament dins del camí de submòdul " "'$displaypath'" -#: git-submodule.sh:826 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "L'opció --cached no es pot usar amb l'opció --files" -#: git-submodule.sh:878 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode inesperat $mod_dst" -#: git-submodule.sh:898 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Avís: $display_name no conté la comissió $sha1_src" -#: git-submodule.sh:901 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Avís: $display_name no conté la comissió $sha1_dst" -#: git-submodule.sh:904 +#: git-submodule.sh:918 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst" -#: git-submodule.sh:1051 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" "S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'" -#: git-submodule.sh:1118 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'" @@ -15012,11 +15298,11 @@ msgstr "" msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "O podeu avortar el rebasament amb 'git rebase --abort'." -#: git-rebase--interactive.sh:1079 +#: git-rebase--interactive.sh:1083 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:1088 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15047,13 +15333,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1101 +#: git-rebase--interactive.sh:1105 msgid "Error trying to find the author identity to amend commit" msgstr "" "Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar " "la comissió" -#: git-rebase--interactive.sh:1106 +#: git-rebase--interactive.sh:1110 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15061,11 +15347,11 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n" "primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 +#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 msgid "Could not commit staged changes." msgstr "No s'ha pogut cometre els canvis «staged»." -#: git-rebase--interactive.sh:1139 +#: git-rebase--interactive.sh:1147 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15079,40 +15365,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 +#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 msgid "Could not execute editor" msgstr "No s'ha pogut executar l'editor" -#: git-rebase--interactive.sh:1160 +#: git-rebase--interactive.sh:1168 #, sh-format msgid "Could not checkout $switch_to" msgstr "No s'ha pogut agafar $switch_to" -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:1173 msgid "No HEAD?" msgstr "No hi ha cap HEAD?" -#: git-rebase--interactive.sh:1166 +#: git-rebase--interactive.sh:1174 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No s'ha pogut crear el $state_dir temporal" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:1176 msgid "Could not mark as interactive" msgstr "No s'ha pogut marcar com a interactiu" -#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 +#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 msgid "Could not init rewritten commits" msgstr "No s'ha pogut iniciar les comissions reescrites" -#: git-rebase--interactive.sh:1283 +#: git-rebase--interactive.sh:1291 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1296 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15122,7 +15408,7 @@ msgstr "" "No obstant, si elimineu tot, s'avortarà el rebasament.\n" "\n" -#: git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1303 msgid "Note that empty commits are commented out" msgstr "Nota que les comissions buides estan comentades" @@ -15167,8 +15453,7 @@ msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre." #: git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -"No es pot baixar fent «rebase»: El vostre índex conté canvis sense " -"cometre." +"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre." #: git-sh-setup.sh:248 #, sh-format @@ -15202,68 +15487,68 @@ msgstr "staged" msgid "unstaged" msgstr "unstaged" -#: git-add--interactive.perl:297 git-add--interactive.perl:322 +#: git-add--interactive.perl:288 git-add--interactive.perl:313 msgid "binary" msgstr "binari" -#: git-add--interactive.perl:306 git-add--interactive.perl:360 +#: git-add--interactive.perl:297 git-add--interactive.perl:351 msgid "nothing" msgstr "res" -#: git-add--interactive.perl:342 git-add--interactive.perl:357 +#: git-add--interactive.perl:333 git-add--interactive.perl:348 msgid "unchanged" msgstr "sense canvis" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:644 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "afegit %d camí\n" msgstr[1] "afegits %d camins\n" -#: git-add--interactive.perl:656 +#: git-add--interactive.perl:647 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" -#: git-add--interactive.perl:659 +#: git-add--interactive.perl:650 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertit %d camí\n" msgstr[1] "revertits %d camins\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:653 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "modificat %d camí\n" msgstr[1] "modificat %d camins\n" -#: git-add--interactive.perl:671 +#: git-add--interactive.perl:662 msgid "Update" msgstr "Actualitza" -#: git-add--interactive.perl:683 +#: git-add--interactive.perl:674 msgid "Revert" msgstr "Reverteix" -#: git-add--interactive.perl:706 +#: git-add--interactive.perl:697 #, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" -#: git-add--interactive.perl:717 +#: git-add--interactive.perl:708 msgid "Add untracked" msgstr "Afegeix sense seguiment" -#: git-add--interactive.perl:723 +#: git-add--interactive.perl:714 msgid "No untracked files.\n" msgstr "Sense fitxers no seguits.\n" -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1030 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15271,7 +15556,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «staging»." -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15279,7 +15564,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «stashing»." -#: git-add--interactive.perl:1045 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15287,7 +15572,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «unstaging»." -#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -15295,15 +15580,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per aplicar-se." -#: git-add--interactive.perl:1051 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding" -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per descartar-se." - -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -15311,17 +15588,17 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per descartar-se." -#: git-add--interactive.perl:1067 +#: git-add--interactive.perl:1058 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" -#: git-add--interactive.perl:1068 +#: git-add--interactive.perl:1059 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1065 #, perl-format msgid "" "---\n" @@ -15335,7 +15612,7 @@ msgstr "" "Les línies que comencin per %s seran suprimides.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1073 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -15346,7 +15623,7 @@ msgstr "" "s'avorta\n" "i el tros es deixa sense cap canvi.\n" -#: git-add--interactive.perl:1096 +#: git-add--interactive.perl:1087 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" @@ -15357,14 +15634,14 @@ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1178 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "El tros editat no s'ha aplica. Editeu-lo de nou (si responeu \"no\" es " "descartarà) [y/n]? " -#: git-add--interactive.perl:1196 +#: git-add--interactive.perl:1187 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15378,7 +15655,7 @@ msgstr "" "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1202 +#: git-add--interactive.perl:1193 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15392,7 +15669,7 @@ msgstr "" "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1208 +#: git-add--interactive.perl:1199 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15406,7 +15683,7 @@ msgstr "" "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1214 +#: git-add--interactive.perl:1205 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15415,7 +15692,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1211 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15424,7 +15701,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1226 +#: git-add--interactive.perl:1217 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15433,7 +15710,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1223 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15442,7 +15719,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1241 +#: git-add--interactive.perl:1232 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15455,223 +15732,223 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1272 +#: git-add--interactive.perl:1263 msgid "The selected hunks do not apply to the index!\n" msgstr "Els trossos seleccionats no apliquen a l'índex\n" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1264 msgid "Apply them to the worktree anyway? " msgstr "Voleu aplicar-los igualment a l'arbre de treball" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1267 msgid "Nothing was applied.\n" msgstr "No s'ha aplicat res.\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1278 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "s'està ignorant %s no fusionat\n" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1287 msgid "Only binary files changed.\n" msgstr "Només s'han canviat els fitxers binaris.\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1289 msgid "No changes.\n" msgstr "Sense canvis.\n" -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1297 msgid "Patch update" msgstr "Actualització del pedaç" -#: git-add--interactive.perl:1358 +#: git-add--interactive.perl:1349 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1350 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1351 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1363 +#: git-add--interactive.perl:1354 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1355 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1356 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1368 +#: git-add--interactive.perl:1359 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1360 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1361 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1373 +#: git-add--interactive.perl:1364 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1365 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1366 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "Aplica aquest tros a l'índex [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1378 +#: git-add--interactive.perl:1369 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1370 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1371 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1374 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d,/" "%s,?]? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1375 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1376 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1379 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1380 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1381 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1493 +#: git-add--interactive.perl:1484 msgid "go to which hunk (<ret> to see more)? " msgstr "vés a quin tros (<ret> per veure'n més)? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1486 msgid "go to which hunk? " msgstr "vés a quin tros? " -#: git-add--interactive.perl:1504 +#: git-add--interactive.perl:1495 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Número no vàlid: '%s'\n" -#: git-add--interactive.perl:1509 +#: git-add--interactive.perl:1500 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Només %d tros disponible.\n" msgstr[1] "Només %d trossos disponibles.\n" -#: git-add--interactive.perl:1535 +#: git-add--interactive.perl:1526 msgid "search for regex? " msgstr "Cerca per expressió regular? " -#: git-add--interactive.perl:1548 +#: git-add--interactive.perl:1539 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Expressió regular de cerca mal formada %s: %s\n" -#: git-add--interactive.perl:1558 +#: git-add--interactive.perl:1549 msgid "No hunk matches the given pattern\n" msgstr "No hi ha trossos que coincideixin amb el patró donat\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 msgid "No previous hunk\n" msgstr "Sense tros previ\n" -#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 msgid "No next hunk\n" msgstr "No hi ha tros següent\n" -#: git-add--interactive.perl:1606 +#: git-add--interactive.perl:1597 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Divideix en %d tros.\n" msgstr[1] "Divideix en %d trossos.\n" -#: git-add--interactive.perl:1658 +#: git-add--interactive.perl:1649 msgid "Review diff" msgstr "Reviseu les diferències" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1677 +#: git-add--interactive.perl:1668 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" -"diff\t - view diff between HEAD and index\n" +"diff - view diff between HEAD and index\n" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" -#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 -#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 -#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 +#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 +#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 msgid "missing --" msgstr "manca --" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1706 #, perl-format msgid "unknown --patch mode: %s" msgstr "desconegut --patch mode: %s" -#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument %s no vàlid, s'esperava --" @@ -15836,7 +16113,7 @@ msgstr "" #: git-send-email.perl:841 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -"A quin s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" +"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" #: git-send-email.perl:859 #, perl-format @@ -15900,7 +16177,9 @@ msgstr "El servidor no admet STARTTLS! %s" #: git-send-email.perl:1403 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." -msgstr "No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i useu --smtp-debug." +msgstr "" +"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i " +"useu --smtp-debug." #: git-send-email.perl:1421 #, perl-format @@ -16002,6 +16281,92 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " +#, fuzzy +#~ msgid "object of unknown type" +#~ msgstr "tipus d'objecte" + +#, fuzzy +#~ msgid "commit object" +#~ msgstr "Error en objecte" + +#, fuzzy +#~ msgid "tree object" +#~ msgstr "objecte" + +#, fuzzy +#~ msgid "blob object" +#~ msgstr "objecte" + +#, fuzzy +#~ msgid "other tag object" +#~ msgstr "objecte d'arbre massa curt" + +#~ msgid "" +#~ "There is nothing to exclude from by :(exclude) patterns.\n" +#~ "Perhaps you forgot to add either ':/' or '.' ?" +#~ msgstr "" +#~ "No hi ha res a excloure per patrons :(exclusió).\n" +#~ "Potser heu oblidat afegir o ':/' o '.' ?" + +#~ msgid "unrecognized format: %%(%s)" +#~ msgstr "format no reconegut: %%(%s)" + +#~ msgid ":strip= requires a positive integer argument" +#~ msgstr ":strip= requereix un paràmetre enter positiu" + +#~ msgid "ref '%s' does not have %ld components to :strip" +#~ msgstr "la referència '%s' no té %ld components per a :strip" + +#~ msgid "unknown %.*s format %s" +#~ msgstr "format de %.*s desconegut %s" + +#~ msgid "[%s: gone]" +#~ msgstr "[%s: no hi és]" + +#~ msgid "[%s]" +#~ msgstr "[%s]" + +#~ msgid "[%s: behind %d]" +#~ msgstr "[%s: darrere per %d]" + +#~ msgid "[%s: ahead %d]" +#~ msgstr "[%s: davant per %d]" + +#~ msgid "[%s: ahead %d, behind %d]" +#~ msgstr "[%s: davant per %d, darrere per %d]" + +#~ msgid " **** invalid ref ****" +#~ msgstr " **** referència no vàlida ****" + +#~ msgid "insanely long object directory %.*s" +#~ msgstr "directori d'objectes increïblement llarg %.*s" + +#~ msgid "git merge [<options>] <msg> HEAD <commit>" +#~ msgstr "git merge [<opcions>] <missatge> HEAD <comissió>" + +#~ msgid "'%s' is not a commit" +#~ msgstr "'%s' no és una comissió" + +#~ msgid "cannot open file '%s'" +#~ msgstr "no es pot obrir el fitxer '%s'" + +#~ msgid "could not close file %s" +#~ msgstr "no s'ha pogut tancar el fitxer %s" + +#~ msgid "tag name too long: %.*s..." +#~ msgstr "nom d'etiqueta massa llarg: %.*s..." + +#~ msgid "tag header too big." +#~ msgstr "la capçalera d'etiqueta és massa gran." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding" +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per descartar-se." + #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" #~ msgstr "" #~ "Usa un heurístic experimental basat en línies en blanc per a millorar les " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-02-18 01:00+0800\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" "PO-Revision-Date: 2016-11-28 18:10+0100\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -66,7 +66,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:114 builtin/merge.c:1206 +#: advice.c:114 builtin/merge.c:1185 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." @@ -350,7 +350,7 @@ msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" @@ -475,7 +475,7 @@ msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet" msgid "sha1 information is lacking or useless (%s)." msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)." -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" @@ -551,7 +551,7 @@ msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" @@ -579,174 +579,174 @@ msgstr "nicht erkannte Eingabe" msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: apply.c:4824 +#: apply.c:4823 #, c-format msgid "can't open patch '%s': %s" msgstr "kann Patch '%s' nicht öffnen: %s" -#: apply.c:4849 +#: apply.c:4850 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: apply.c:4855 apply.c:4870 +#: apply.c:4856 apply.c:4871 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu." msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu." -#: apply.c:4863 +#: apply.c:4864 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet." msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet." -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 #: git-add--interactive.perl:239 msgid "path" msgstr "Pfad" -#: apply.c:4911 +#: apply.c:4912 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: apply.c:4914 +#: apply.c:4915 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: apply.c:4916 builtin/am.c:2286 +#: apply.c:4917 builtin/am.c:2285 msgid "num" msgstr "Anzahl" -#: apply.c:4917 +#: apply.c:4918 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: apply.c:4920 +#: apply.c:4921 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: apply.c:4922 +#: apply.c:4923 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: apply.c:4926 +#: apply.c:4927 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: apply.c:4928 +#: apply.c:4929 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: apply.c:4930 +#: apply.c:4931 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: apply.c:4932 +#: apply.c:4933 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: apply.c:4934 +#: apply.c:4935 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: apply.c:4936 +#: apply.c:4937 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: apply.c:4938 +#: apply.c:4939 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: apply.c:4940 +#: apply.c:4941 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: apply.c:4942 +#: apply.c:4943 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: apply.c:4947 +#: apply.c:4948 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: apply.c:4948 builtin/am.c:2265 +#: apply.c:4949 builtin/am.c:2264 msgid "action" msgstr "Aktion" -#: apply.c:4949 +#: apply.c:4950 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: apply.c:4952 apply.c:4955 +#: apply.c:4953 apply.c:4956 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: apply.c:4958 +#: apply.c:4959 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: apply.c:4960 +#: apply.c:4961 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: apply.c:4962 +#: apply.c:4963 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: apply.c:4964 +#: apply.c:4965 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: apply.c:4967 +#: apply.c:4968 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: apply.c:4970 +#: apply.c:4971 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: apply.c:4972 builtin/am.c:2274 +#: apply.c:4973 builtin/am.c:2273 msgid "root" msgstr "Wurzelverzeichnis" -#: apply.c:4973 +#: apply.c:4974 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" @@ -769,103 +769,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" -#: archive.c:429 +#: archive.c:417 msgid "fmt" msgstr "Format" -#: archive.c:429 +#: archive.c:417 msgid "archive format" msgstr "Archivformat" -#: archive.c:430 builtin/log.c:1429 +#: archive.c:418 builtin/log.c:1436 msgid "prefix" msgstr "Präfix" -#: archive.c:431 +#: archive.c:419 msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 #: parse-options.h:153 msgid "file" msgstr "Datei" -#: archive.c:433 builtin/archive.c:89 +#: archive.c:421 builtin/archive.c:89 msgid "write the archive to this file" msgstr "das Archiv in diese Datei schreiben" -#: archive.c:435 +#: archive.c:423 msgid "read .gitattributes in working directory" msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen" -#: archive.c:436 +#: archive.c:424 msgid "report archived files on stderr" msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben" -#: archive.c:437 +#: archive.c:425 msgid "store only" msgstr "nur speichern" -#: archive.c:438 +#: archive.c:426 msgid "compress faster" msgstr "schneller komprimieren" -#: archive.c:446 +#: archive.c:434 msgid "compress better" msgstr "besser komprimieren" -#: archive.c:449 +#: archive.c:437 msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "Repository" -#: archive.c:452 builtin/archive.c:91 +#: archive.c:440 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "Archiv vom Remote-Repository <Repository> abrufen" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "Programm" -#: archive.c:454 builtin/archive.c:93 +#: archive.c:442 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: archive.c:461 +#: archive.c:449 msgid "Unexpected option --remote" msgstr "Unerwartete Option --remote" -#: archive.c:463 +#: archive.c:451 msgid "Option --exec can only be used together with --remote" msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden." -#: archive.c:465 +#: archive.c:453 msgid "Unexpected option --output" msgstr "Unerwartete Option --output" -#: archive.c:487 +#: archive.c:475 #, c-format msgid "Unknown archive format '%s'" msgstr "Unbekanntes Archivformat '%s'" -#: archive.c:494 +#: archive.c:482 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument für Format '%s' nicht unterstützt: -%d" -#: attr.c:263 +#: attr.c:212 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "%.*s ist kein gültiger Attributname" + +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -873,27 +878,27 @@ msgstr "" "Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' für führende Ausrufezeichen." -#: bisect.c:441 +#: bisect.c:444 #, c-format msgid "Could not open file '%s'" msgstr "Konnte Datei '%s' nicht öffnen" -#: bisect.c:446 +#: bisect.c:449 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s" -#: bisect.c:655 +#: bisect.c:657 #, c-format msgid "We cannot bisect more!\n" msgstr "Keine binäre Suche mehr möglich!\n" -#: bisect.c:708 +#: bisect.c:710 #, c-format msgid "Not a valid commit name %s" msgstr "%s ist kein gültiger Commit-Name" -#: bisect.c:732 +#: bisect.c:734 #, c-format msgid "" "The merge base %s is bad.\n" @@ -902,7 +907,7 @@ msgstr "" "Die Merge-Basis %s ist fehlerhaft.\n" "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n" -#: bisect.c:737 +#: bisect.c:739 #, c-format msgid "" "The merge base %s is new.\n" @@ -911,7 +916,7 @@ msgstr "" "Die Merge-Basis %s ist neu.\n" "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n" -#: bisect.c:742 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is %s.\n" @@ -920,7 +925,7 @@ msgstr "" "Die Merge-Basis %s ist %s.\n" "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n" -#: bisect.c:750 +#: bisect.c:752 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -931,7 +936,7 @@ msgstr "" "git bisect kann in diesem Fall nicht richtig arbeiten.\n" "Vielleicht verwechselten Sie %s und %s Commits?\n" -#: bisect.c:763 +#: bisect.c:765 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -943,36 +948,36 @@ msgstr "" "erste %s Commit zwischen %s und %s befindet.\n" "Es wird dennoch fortgesetzt." -#: bisect.c:798 +#: bisect.c:800 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n" -#: bisect.c:849 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "ein %s Commit wird benötigt" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:917 +#: bisect.c:919 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:947 +#: bisect.c:949 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen" -#: bisect.c:967 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:975 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -981,7 +986,7 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:994 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -990,7 +995,7 @@ msgstr[1] "(ungefähr %d Schritte)" #. TRANSLATORS: the last %s will be replaced with #. "(roughly %d steps)" translation -#: bisect.c:998 +#: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1136,7 +1141,7 @@ msgstr "Ungültiger Branchpunkt: '%s'" msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" -#: branch.c:363 +#: branch.c:364 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." @@ -1151,7 +1156,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -1160,10 +1165,10 @@ msgstr "Konnte '%s' nicht öffnen" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:360 builtin/shortlog.c:177 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 +#: builtin/merge.c:359 builtin/shortlog.c:176 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -1202,7 +1207,7 @@ msgstr "\"rev-list\" abgebrochen" msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" @@ -1225,8 +1230,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen" msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" @@ -1236,7 +1241,7 @@ msgstr "konnte %s nicht parsen" msgid "%s %s is not a commit!" msgstr "%s %s ist kein Commit!" -#: commit.c:1514 +#: commit.c:1511 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" @@ -1252,144 +1257,169 @@ msgstr "" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:518 +#: config.c:191 +msgid "relative config include conditionals must come from files" +msgstr "" +"Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden " +"müssen\n" +"aus Dateien kommen." + +#: config.c:711 #, c-format msgid "bad config line %d in blob %s" msgstr "Ungültige Konfigurationszeile %d in Blob %s" -#: config.c:522 +#: config.c:715 #, c-format msgid "bad config line %d in file %s" msgstr "Ungültige Konfigurationszeile %d in Datei %s" -#: config.c:526 +#: config.c:719 #, c-format msgid "bad config line %d in standard input" msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe" -#: config.c:530 +#: config.c:723 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s" -#: config.c:534 +#: config.c:727 #, c-format msgid "bad config line %d in command line %s" msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s" -#: config.c:538 +#: config.c:731 #, c-format msgid "bad config line %d in %s" msgstr "Ungültige Konfigurationszeile %d in %s" -#: config.c:657 +#: config.c:859 msgid "out of range" msgstr "Außerhalb des Bereichs" -#: config.c:657 +#: config.c:859 msgid "invalid unit" msgstr "Ungültige Einheit" -#: config.c:663 +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:668 +#: config.c:870 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s" -#: config.c:671 +#: config.c:873 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s" -#: config.c:674 +#: config.c:876 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: " "%s" -#: config.c:677 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: " "%s" -#: config.c:680 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: " "%s" -#: config.c:683 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:770 +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:865 config.c:876 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:993 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1149 +#: config.c:1359 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" -#: config.c:1339 +#: config.c:1557 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:1389 +#: config.c:1611 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:1743 +#: config.c:1970 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Ungültiger %s: '%s'" + +#: config.c:1991 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'" + +#: config.c:2017 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "" +"Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 " +"liegen." + +#: config.c:2028 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n" "nicht parsen." -#: config.c:1745 +#: config.c:2030 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:1804 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2225 config.c:2450 +#: config.c:2423 config.c:2648 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2343 +#: config.c:2541 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:2345 +#: config.c:2543 builtin/remote.c:774 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." @@ -1564,21 +1594,21 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:3085 +#: diff.c:3102 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3411 +#: diff.c:3428 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "--name-only, --name-status, --check und -s schließen sich gegenseitig aus" -#: diff.c:3501 +#: diff.c:3518 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3664 +#: diff.c:3681 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1587,22 +1617,22 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3678 +#: diff.c:3695 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:4696 +#: diff.c:4719 msgid "inexact rename detection was skipped due to too many files." msgstr "" "Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n" "übersprungen." -#: diff.c:4699 +#: diff.c:4722 msgid "only found copies from modified paths due to too many files." msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden" -#: diff.c:4702 +#: diff.c:4725 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1610,188 +1640,213 @@ msgstr "" "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:1862 +#: dir.c:1899 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:1981 +#: dir.c:2018 msgid "Untracked cache is disabled on this system or location." msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert." -#: dir.c:2759 +#: dir.c:2776 dir.c:2781 +#, c-format +msgid "could not create directories for %s" +msgstr "Konnte Verzeichnisse für '%s' nicht erstellen." + +#: dir.c:2806 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." -#: fetch-pack.c:213 +#: entry.c:280 +#, c-format +msgid "could not stat file '%s'" +msgstr "konnte Datei '%s' nicht lesen" + +#: fetch-pack.c:249 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: erwartete shallow-Liste" -#: fetch-pack.c:225 +#: fetch-pack.c:261 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen" -#: fetch-pack.c:243 +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "Fehler am anderen Ende: %s" + +#: fetch-pack.c:281 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:295 +#: fetch-pack.c:333 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:381 +#: fetch-pack.c:419 #, c-format msgid "invalid shallow line: %s" msgstr "Ungültige shallow-Zeile: %s" -#: fetch-pack.c:387 +#: fetch-pack.c:425 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungültige unshallow-Zeile: %s" -#: fetch-pack.c:389 +#: fetch-pack.c:427 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:392 +#: fetch-pack.c:430 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:394 +#: fetch-pack.c:432 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:397 +#: fetch-pack.c:435 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:436 +#: fetch-pack.c:474 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:450 +#: fetch-pack.c:488 #, c-format msgid "invalid commit %s" msgstr "Ungültiger Commit %s" -#: fetch-pack.c:483 +#: fetch-pack.c:521 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:493 progress.c:235 +#: fetch-pack.c:531 progress.c:235 msgid "done" msgstr "Fertig" -#: fetch-pack.c:505 +#: fetch-pack.c:543 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:551 +#: fetch-pack.c:589 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollständig" -#: fetch-pack.c:697 +#: fetch-pack.c:737 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:735 +#: fetch-pack.c:775 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:743 +#: fetch-pack.c:783 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:799 +#: fetch-pack.c:839 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:815 +#: fetch-pack.c:855 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:817 +#: fetch-pack.c:857 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:844 +#: fetch-pack.c:884 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:848 +#: fetch-pack.c:888 msgid "Server supports multi_ack_detailed" msgstr "Server unterstützt multi_ack_detailed" -#: fetch-pack.c:851 +#: fetch-pack.c:891 msgid "Server supports no-done" msgstr "Server unterstützt no-done" -#: fetch-pack.c:857 +#: fetch-pack.c:897 msgid "Server supports multi_ack" msgstr "Server unterstützt multi_ack" -#: fetch-pack.c:861 +#: fetch-pack.c:901 msgid "Server supports side-band-64k" msgstr "Server unterstützt side-band-64k" -#: fetch-pack.c:865 +#: fetch-pack.c:905 msgid "Server supports side-band" msgstr "Server unterstützt side-band" -#: fetch-pack.c:869 +#: fetch-pack.c:909 msgid "Server supports allow-tip-sha1-in-want" msgstr "Server unterstützt allow-tip-sha1-in-want" -#: fetch-pack.c:873 +#: fetch-pack.c:913 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Server unterstützt allow-reachable-sha1-in-want" -#: fetch-pack.c:883 +#: fetch-pack.c:923 msgid "Server supports ofs-delta" msgstr "Server unterstützt ofs-delta" -#: fetch-pack.c:890 +#: fetch-pack.c:930 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:896 +#: fetch-pack.c:936 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:900 +#: fetch-pack.c:940 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:902 +#: fetch-pack.c:942 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:913 +#: fetch-pack.c:953 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:925 +#: fetch-pack.c:965 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1087 +#: fetch-pack.c:1127 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" +#: fetch-pack.c:1149 +#, c-format +msgid "no such remote ref %s" +msgstr "keine solche Remote-Referenz %s" + +#: fetch-pack.c:1152 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." + #: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" @@ -1810,17 +1865,17 @@ msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors" -#: grep.c:1794 +#: grep.c:1796 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:1822 +#: grep.c:1824 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" @@ -1889,7 +1944,7 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: ident.c:334 +#: ident.c:343 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1915,6 +1970,39 @@ msgstr "" "Lassen Sie die Option \"--global\" weg, um die Identität nur\n" "für dieses Repository zu setzen.\n" +#: ident.c:367 +msgid "no email was given and auto-detection is disabled" +msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert" + +#: ident.c:372 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)" + +#: ident.c:382 +msgid "no name was given and auto-detection is disabled" +msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert" + +#: ident.c:388 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)" + +#: ident.c:396 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt." + +#: ident.c:402 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" + +#: ident.c:417 builtin/commit.c:611 +#, c-format +msgid "invalid date format: %s" +msgstr "Ungültiges Datumsformat: %s" + #: lockfile.c:152 #, c-format msgid "" @@ -1944,8 +2032,8 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s" msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 -#: builtin/checkout.c:588 builtin/clone.c:731 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 +#: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." @@ -2015,7 +2103,7 @@ msgstr "Fehler bei Ausführung des internen Merges" msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:1088 merge-recursive.c:1102 +#: merge-recursive.c:1092 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2024,7 +2112,16 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1094 merge-recursive.c:1107 +#: merge-recursive.c:1097 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" +"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " +"%s wurde im Arbeitsbereich gelassen." + +#: merge-recursive.c:1104 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2033,20 +2130,29 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1150 +#: merge-recursive.c:1109 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " +"%s wurde im Arbeitsbereich bei %s gelassen." + +#: merge-recursive.c:1143 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1150 +#: merge-recursive.c:1143 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1207 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1232 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2055,139 +2161,139 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1299 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:1332 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: merge-recursive.c:1535 +#: merge-recursive.c:1528 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1550 +#: merge-recursive.c:1543 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1557 merge-recursive.c:1771 +#: merge-recursive.c:1550 merge-recursive.c:1780 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1614 +#: merge-recursive.c:1607 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1617 +#: merge-recursive.c:1610 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1670 +#: merge-recursive.c:1679 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1670 +#: merge-recursive.c:1679 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1680 +#: merge-recursive.c:1689 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1687 +#: merge-recursive.c:1696 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1723 +#: merge-recursive.c:1732 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:1737 +#: merge-recursive.c:1746 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1741 git-submodule.sh:930 +#: merge-recursive.c:1750 git-submodule.sh:944 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:1742 +#: merge-recursive.c:1751 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:1836 +#: merge-recursive.c:1845 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1862 +#: merge-recursive.c:1871 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1874 +#: merge-recursive.c:1883 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:1883 +#: merge-recursive.c:1892 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1920 +#: merge-recursive.c:1929 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1929 +#: merge-recursive.c:1938 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:2012 +#: merge-recursive.c:2021 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:2025 +#: merge-recursive.c:2034 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:2064 +#: merge-recursive.c:2073 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2127 +#: merge-recursive.c:2136 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -2269,18 +2375,35 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:826 +#: path.c:810 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." -#: pathspec.c:142 +#: pathspec.c:125 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt" + +#: pathspec.c:143 +msgid "Only one 'attr:' specification is allowed." +msgstr "Es ist nur eine Angabe von 'attr:' erlaubt." + +#: pathspec.c:146 +msgid "attr spec must not be empty" +msgstr "Angabe von 'attr:' darf nicht leer sein" + +#: pathspec.c:189 +#, c-format +msgid "invalid attribute name %s" +msgstr "Ungültiger Attributname %s" + +#: pathspec.c:254 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind " "inkompatibel." -#: pathspec.c:149 +#: pathspec.c:261 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2288,52 +2411,52 @@ msgstr "" "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n" "mit allen anderen Optionen." -#: pathspec.c:188 +#: pathspec.c:301 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'" -#: pathspec.c:201 +#: pathspec.c:322 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'" -#: pathspec.c:206 +#: pathspec.c:327 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'" -#: pathspec.c:238 +#: pathspec.c:365 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'" -#: pathspec.c:293 pathspec.c:315 +#: pathspec.c:421 pathspec.c:443 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: pathspec.c:350 +#: pathspec.c:483 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' und 'glob' sind inkompatibel" -#: pathspec.c:363 +#: pathspec.c:496 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' liegt außerhalb des Repositories" -#: pathspec.c:451 +#: pathspec.c:584 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (Kürzel: '%c')" -#: pathspec.c:461 +#: pathspec.c:594 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s" -#: pathspec.c:511 +#: pathspec.c:644 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2342,24 +2465,16 @@ msgstr "" "ungültig.\n" "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen." -#: pathspec.c:535 +#: pathspec.c:668 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" -#: pathspec.c:544 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" -msgstr "" -":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" -"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" - #: pretty.c:982 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: read-cache.c:1307 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2368,7 +2483,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1317 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2377,161 +2492,268 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: refs.c:576 builtin/merge.c:844 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#, c-format +msgid "could not stat '%s'" +msgstr "Konnte '%s' nicht lesen." + +#: read-cache.c:2388 +#, c-format +msgid "unable to open git dir: %s" +msgstr "konnte Git-Verzeichnis nicht öffnen: %s" + +#: read-cache.c:2400 +#, c-format +msgid "unable to unlink: %s" +msgstr "Konnte '%s' nicht entfernen." + +#: refs.c:620 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: refs/files-backend.c:2481 +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung verboten." + +#: refs/files-backend.c:1631 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:2484 +#: refs/files-backend.c:1634 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" -#: refs/files-backend.c:2493 +#: refs/files-backend.c:1643 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" -#: ref-filter.c:56 +#: ref-filter.c:35 wt-status.c:1780 +msgid "gone" +msgstr "entfernt" + +#: ref-filter.c:36 +#, c-format +msgid "ahead %d" +msgstr "%d voraus" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "%d hinterher" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" +msgstr "%d voraus, %d hinterher" + +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:58 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:72 +#: ref-filter.c:120 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "Positiver Wert erwartet refname:lstrip=%s" + +#: ref-filter.c:124 +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "Positiver Wert erwartet refname:rstrip=%s" + +#: ref-filter.c:126 #, c-format -msgid "unrecognized format: %%(%s)" -msgstr "nicht erkanntes Format: %%(%s)" +msgid "unrecognized %%(%s) argument: %s" +msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:78 +#: ref-filter.c:166 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:85 +#: ref-filter.c:173 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) akzeptiert keine Argumente" -#: ref-filter.c:92 +#: ref-filter.c:180 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) akzeptiert keine Argumente" -#: ref-filter.c:111 +#: ref-filter.c:199 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:113 +#: ref-filter.c:201 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:123 +#: ref-filter.c:214 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "Positiver Wert erwartet objectname:short=%s" + +#: ref-filter.c:218 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "nicht erkanntes %%(objectname) Argument: %s" -#: ref-filter.c:145 +#: ref-filter.c:245 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:157 +#: ref-filter.c:257 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:161 +#: ref-filter.c:261 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:167 +#: ref-filter.c:267 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:171 +#: ref-filter.c:271 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" -#: ref-filter.c:255 +#: ref-filter.c:286 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "nicht erkanntes %%(if) Argument: %s" + +#: ref-filter.c:371 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:281 +#: ref-filter.c:397 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:383 +#: ref-filter.c:501 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" + +#: ref-filter.c:561 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" + +#: ref-filter.c:563 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "format: %%(then) Atom mehr als einmal verwendet" + +#: ref-filter.c:565 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "format: %%(then) Atom nach %%(else) verwendet" + +#: ref-filter.c:591 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" + +#: ref-filter.c:593 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" + +#: ref-filter.c:595 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "Format: %%(end) Atom mehr als einmal verwendet" + +#: ref-filter.c:608 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:435 +#: ref-filter.c:663 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:898 -msgid ":strip= requires a positive integer argument" -msgstr ":strip= erfordert eine positive Ganzzahl als Argument" +#: ref-filter.c:1247 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: ref-filter.c:903 +#: ref-filter.c:1250 #, c-format -msgid "ref '%s' does not have %ld components to :strip" -msgstr "Referenz '%s' hat keine %ld Komponenten für :strip" +msgid "(no branch, bisect started on %s)" +msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#: ref-filter.c:1066 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: ref-filter.c:1256 #, c-format -msgid "unknown %.*s format %s" -msgstr "Unbekanntes %.*s Format %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD losgelöst bei %s)" -#: ref-filter.c:1086 ref-filter.c:1117 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: ref-filter.c:1261 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD losgelöst von %s)" + +#: ref-filter.c:1265 +msgid "(no branch)" +msgstr "(kein Branch)" + +#: ref-filter.c:1420 ref-filter.c:1451 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1089 ref-filter.c:1120 +#: ref-filter.c:1423 ref-filter.c:1454 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:1343 +#: ref-filter.c:1692 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:1410 +#: ref-filter.c:1759 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:1415 +#: ref-filter.c:1764 #, c-format msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" -#: ref-filter.c:1670 +#: ref-filter.c:2028 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:1734 +#: ref-filter.c:2109 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" @@ -2630,8 +2852,10 @@ msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n" -msgstr[1] "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" +msgstr[0] "" +"Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n" +msgstr[1] "" +"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" #: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" @@ -2681,16 +2905,26 @@ msgstr "Öffnen von /dev/null fehlgeschlagen" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) fehlgeschlagen" -#: send-pack.c:297 +#: send-pack.c:150 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s" + +#: send-pack.c:152 +#, c-format +msgid "remote unpack failed: %s" +msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s" + +#: send-pack.c:315 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:410 +#: send-pack.c:428 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" -#: send-pack.c:412 +#: send-pack.c:430 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2698,11 +2932,11 @@ msgstr "" "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n" "Versand (\"--signed push\") unterstützt" -#: send-pack.c:424 +#: send-pack.c:442 msgid "the receiving end does not support --atomic push" msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" -#: send-pack.c:429 +#: send-pack.c:447 msgid "the receiving end does not support push options" msgstr "die Gegenseite unterstützt keine Push-Optionen" @@ -2741,12 +2975,12 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:294 sequencer.c:1667 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." @@ -2756,13 +2990,13 @@ msgstr "Konnte nicht nach '%s' schreiben." msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "Fehler beim Fertigstellen von '%s'." -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 -#: builtin/commit.c:749 builtin/merge.c:1036 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 +#: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" @@ -2829,17 +3063,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:688 +#: sequencer.c:694 #, c-format msgid "could not parse commit %s\n" msgstr "Konnte Commit %s nicht parsen\n" -#: sequencer.c:693 +#: sequencer.c:699 #, c-format msgid "could not parse parent commit %s\n" msgstr "Konnte Eltern-Commit %s nicht parsen\n" -#: sequencer.c:815 +#: sequencer.c:821 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2850,7 +3084,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:821 +#: sequencer.c:827 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2861,229 +3095,231 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 sequencer.c:852 +#: sequencer.c:833 sequencer.c:858 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:836 +#: sequencer.c:842 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:838 +#: sequencer.c:844 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:840 +#: sequencer.c:846 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:846 +#: sequencer.c:852 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:855 git-rebase--interactive.sh:445 +#: sequencer.c:861 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:863 +#: sequencer.c:869 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:870 +#: sequencer.c:876 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:875 +#: sequencer.c:881 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:880 +#: sequencer.c:886 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:946 +#: sequencer.c:952 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:964 +#: sequencer.c:970 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:972 +#: sequencer.c:978 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:976 +#: sequencer.c:982 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." -#: sequencer.c:982 +#: sequencer.c:988 #, c-format msgid "cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen." #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1001 +#: sequencer.c:1009 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1063 sequencer.c:1812 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1114 +#: sequencer.c:1122 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:1115 +#: sequencer.c:1123 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:1157 +#: sequencer.c:1165 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:1167 +#: sequencer.c:1175 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:1174 +#: sequencer.c:1182 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:1294 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:1302 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:1334 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "Konnte '%s' nicht lesen." -#: sequencer.c:1341 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." -msgstr "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." +msgstr "" +"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:1343 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:1348 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:1359 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:1361 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:1424 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:1427 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:1484 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:1522 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:1523 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1526 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:1596 sequencer.c:2150 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:1598 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:1600 sequencer.c:1634 +#: sequencer.c:1615 sequencer.c:1649 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" -#: sequencer.c:1620 builtin/grep.c:904 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:1622 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:1623 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:1629 +#: sequencer.c:1644 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:1640 +#: sequencer.c:1655 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "Sie scheinen HEAD verschoben zu haben. Keine Zurücksetzung, prüfen Sie HEAD." +msgstr "" +"Sie scheinen HEAD verschoben zu haben. Keine Zurücksetzung, prüfen Sie HEAD." -#: sequencer.c:1777 sequencer.c:2049 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:1817 builtin/difftool.c:574 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:1833 +#: sequencer.c:1848 msgid "could not read index" msgstr "Konnte den Index nicht lesen." -#: sequencer.c:1838 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3099,11 +3335,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:1844 +#: sequencer.c:1859 msgid "and made changes to the index and/or the working tree\n" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n" -#: sequencer.c:1850 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3121,17 +3357,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1905 git-rebase.sh:168 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "Automatischen Stash angewendet." -#: sequencer.c:1917 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:1919 git-rebase.sh:172 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3142,59 +3378,59 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:2000 +#: sequencer.c:2016 #, c-format -msgid "stopped at %s... %.*s" -msgstr "Angehalten bei %s... %.*s" +msgid "Stopped at %s... %.*s\n" +msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:2027 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:2057 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:2061 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:2068 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:2075 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:2159 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:2164 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." -#: sequencer.c:2173 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:2175 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:2177 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:2180 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3205,25 +3441,25 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:2190 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:2270 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:2274 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:2307 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: setup.c:160 +#: setup.c:165 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3233,7 +3469,7 @@ msgstr "" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." -#: setup.c:173 +#: setup.c:178 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3245,7 +3481,7 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:223 +#: setup.c:228 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3256,29 +3492,34 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:470 +#: setup.c:475 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" -#: setup.c:478 +#: setup.c:483 msgid "unknown repository extensions found:" msgstr "Unbekannte Repository-Erweiterungen gefunden:" -#: setup.c:768 +#: setup.c:776 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s" -#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 +#: setup.c:778 builtin/index-pack.c:1646 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: setup.c:852 +#: setup.c:1010 msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." -#: setup.c:927 +#: setup.c:1022 setup.c:1028 +#, c-format +msgid "Cannot change to '%s'" +msgstr "Kann nicht nach '%s' wechseln." + +#: setup.c:1041 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3288,12 +3529,7 @@ msgstr "" "%s)\n" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." -#: setup.c:934 -#, c-format -msgid "Cannot change to '%s/..'" -msgstr "Kann nicht in Verzeichnis '%s/..' wechseln" - -#: setup.c:996 +#: setup.c:1106 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3302,60 +3538,60 @@ msgstr "" "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n" "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben." -#: sha1_file.c:490 +#: sha1_file.c:559 #, c-format msgid "path '%s' does not exist" msgstr "Pfad '%s' existiert nicht" -#: sha1_file.c:516 +#: sha1_file.c:585 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n" "Arbeitsverzeichnis unterstützt." -#: sha1_file.c:522 +#: sha1_file.c:591 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: sha1_file.c:528 +#: sha1_file.c:597 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: sha1_file.c:536 +#: sha1_file.c:605 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: sha1_file.c:1176 +#: sha1_file.c:1245 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: sha1_file.c:2637 +#: sha1_file.c:2721 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)" -#: sha1_file.c:2641 +#: sha1_file.c:2725 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)" -#: sha1_name.c:407 +#: sha1_name.c:409 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1_name.c:418 +#: sha1_name.c:420 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1_name.c:578 +#: sha1_name.c:580 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3380,46 +3616,56 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: submodule.c:65 submodule.c:99 +#: submodule.c:67 submodule.c:101 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n" "Sie zuerst die Konflikte auf" -#: submodule.c:69 submodule.c:103 +#: submodule.c:71 submodule.c:105 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden" -#: submodule.c:77 +#: submodule.c:79 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" -#: submodule.c:110 +#: submodule.c:112 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" -#: submodule.c:121 +#: submodule.c:123 msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:159 +#: submodule.c:161 msgid "negative values not allowed for submodule.fetchJobs" msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt" -#: submodule.c:1184 +#: submodule.c:1194 +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "'%s' nicht als Git-Repository erkannt" + +#: submodule.c:1332 #, c-format -msgid "could not start 'git status in submodule '%s'" +msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1197 +#: submodule.c:1345 #, c-format -msgid "could not run 'git status in submodule '%s'" -msgstr "konnte 'git status' in Submodul '%s' nicht ausführen" +msgid "could not run 'git status' in submodule '%s'" +msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1398 +#: submodule.c:1421 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "Submodul '%s' hat einen geänderten Index." + +#: submodule.c:1678 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3427,18 +3673,18 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:1410 submodule.c:1471 +#: submodule.c:1690 submodule.c:1746 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "konnte Name für Submodul '%s' nicht nachschlagen" -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 -#: builtin/submodule--helper.c:650 +#: submodule.c:1694 builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: submodule.c:1420 +#: submodule.c:1697 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3449,12 +3695,25 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:1512 +#: submodule.c:1781 #, c-format msgid "could not recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" -#: submodule-config.c:360 +#: submodule.c:1825 +msgid "could not start ls-files in .." +msgstr "Konnte 'ls-files' nicht in .. starten" + +#: submodule.c:1845 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?" + +#: submodule.c:1864 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" + +#: submodule-config.c:380 #, c-format msgid "invalid value for %s" msgstr "Ungültiger Wert für %s" @@ -3523,7 +3782,7 @@ msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n" msgid "transport: invalid depth option '%s'" msgstr "transport: ungültige --depth Option '%s'" -#: transport.c:885 +#: transport.c:889 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3532,7 +3791,7 @@ msgstr "" "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n" "Remote-Repository gefunden wurden:\n" -#: transport.c:889 +#: transport.c:893 #, c-format msgid "" "\n" @@ -3559,11 +3818,11 @@ msgstr "" "zum Versenden zu einem Remote-Repository.\n" "\n" -#: transport.c:897 +#: transport.c:901 msgid "Aborting." msgstr "Abbruch." -#: transport-helper.c:1082 +#: transport-helper.c:1080 #, c-format msgid "Could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." @@ -3584,7 +3843,7 @@ msgstr "leerer Dateiname in Tree-Eintrag" msgid "too-short tree file" msgstr "zu kurze Tree-Datei" -#: unpack-trees.c:99 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3595,7 +3854,7 @@ msgstr "" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n" "wechseln." -#: unpack-trees.c:101 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3605,7 +3864,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:104 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3615,7 +3874,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen." -#: unpack-trees.c:106 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3625,7 +3884,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3635,7 +3894,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen." -#: unpack-trees.c:111 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3644,7 +3903,7 @@ msgstr "" "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:121 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3654,7 +3913,7 @@ msgstr "" "Dateien in diesen Verzeichnissen verloren gehen:\n" "%s" -#: unpack-trees.c:120 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3664,7 +3923,7 @@ msgstr "" "den Checkout entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:122 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3675,7 +3934,7 @@ msgstr "" "Checkout entfernt werden:\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3685,7 +3944,7 @@ msgstr "" "den Merge entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." -#: unpack-trees.c:127 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3696,7 +3955,7 @@ msgstr "" "Merge entfernt werden:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3706,7 +3965,7 @@ msgstr "" "den %s entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:132 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3716,7 +3975,7 @@ msgstr "" "den %s entfernt werden:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3727,7 +3986,7 @@ msgstr "" "den Checkout überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:139 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3739,7 +3998,7 @@ msgstr "" "Checkout überschrieben werden:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3749,7 +4008,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." -#: unpack-trees.c:144 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3759,7 +4018,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3769,7 +4028,7 @@ msgstr "" "den %s überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:149 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3780,12 +4039,12 @@ msgstr "" "%s überschrieben werden:\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:161 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden." -#: unpack-trees.c:159 +#: unpack-trees.c:164 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3796,7 +4055,7 @@ msgstr "" "aktuell:\n" "%s" -#: unpack-trees.c:161 +#: unpack-trees.c:166 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3807,7 +4066,7 @@ msgstr "" "über einen partiellen Checkout überschrieben werden:\n" "%s" -#: unpack-trees.c:163 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3818,45 +4077,61 @@ msgstr "" "über einen partiellen Checkout entfernt werden:\n" "%s" -#: unpack-trees.c:240 +#: unpack-trees.c:170 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"Kann Submodul nicht aktualisieren:\n" +"%s" + +#: unpack-trees.c:247 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:270 +#: unpack-trees.c:272 +#, c-format +msgid "submodule update strategy not supported for submodule '%s'" +msgstr "" +"Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht " +"unterstützt." + +#: unpack-trees.c:340 msgid "Checking out files" msgstr "Checke Dateien aus" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "ungültige Escape-Sequenz %XX" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "fehlender Host und Schema ist nicht 'file:'" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "eine 'file:' URL darf keine Portnummer enthalten" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "Hostname enthält ungültige Zeichen" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "ungültige Portnummer" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: worktree.c:282 +#: worktree.c:285 #, c-format msgid "failed to read '%s'" msgstr "Fehler beim Lesen von '%s'" @@ -3871,28 +4146,28 @@ msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen." msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: wrapper.c:605 wrapper.c:626 +#: wrapper.c:581 wrapper.c:602 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:634 +#: wrapper.c:610 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." -#: wrapper.c:658 +#: wrapper.c:634 #, c-format msgid "could not write to %s" msgstr "Konnte nicht nach '%s' schreiben." -#: wrapper.c:660 +#: wrapper.c:636 #, c-format msgid "could not close %s" msgstr "Konnte '%s' nicht schließen." @@ -3930,11 +4205,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:199 wt-status.c:945 +#: wt-status.c:199 wt-status.c:958 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:217 wt-status.c:954 +#: wt-status.c:217 wt-status.c:967 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" @@ -4042,15 +4317,15 @@ msgstr "geänderter Inhalt, " msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:818 +#: wt-status.c:831 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:820 +#: wt-status.c:833 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:901 +#: wt-status.c:914 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4058,114 +4333,114 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:1013 +#: wt-status.c:1026 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:1016 +#: wt-status.c:1029 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:1018 +#: wt-status.c:1031 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)" -#: wt-status.c:1023 +#: wt-status.c:1036 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:1026 +#: wt-status.c:1039 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:1036 +#: wt-status.c:1049 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:1039 +#: wt-status.c:1052 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:1043 +#: wt-status.c:1056 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)" -#: wt-status.c:1045 +#: wt-status.c:1058 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1047 +#: wt-status.c:1060 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " "wiederherzustellen)" -#: wt-status.c:1176 +#: wt-status.c:1189 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo fehlt." -#: wt-status.c:1178 +#: wt-status.c:1191 msgid "No commands done." msgstr "Keine Befehle ausgeführt." -#: wt-status.c:1181 +#: wt-status.c:1194 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):" msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):" -#: wt-status.c:1192 +#: wt-status.c:1205 #, c-format msgid " (see more in file %s)" msgstr " (mehr Informationen in Datei %s)" -#: wt-status.c:1197 +#: wt-status.c:1210 msgid "No commands remaining." msgstr "Keine Befehle verbleibend." -#: wt-status.c:1200 +#: wt-status.c:1213 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):" msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):" -#: wt-status.c:1208 +#: wt-status.c:1221 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)" -#: wt-status.c:1221 +#: wt-status.c:1234 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1226 +#: wt-status.c:1239 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1240 +#: wt-status.c:1253 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:1242 +#: wt-status.c:1255 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1244 +#: wt-status.c:1257 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch " "auszuchecken)" -#: wt-status.c:1250 +#: wt-status.c:1263 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1254 +#: wt-status.c:1267 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4173,134 +4448,134 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1259 +#: wt-status.c:1272 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1262 +#: wt-status.c:1275 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:1266 +#: wt-status.c:1279 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:1271 +#: wt-status.c:1284 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1274 +#: wt-status.c:1287 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1276 +#: wt-status.c:1289 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " "abgeschlossen sind)" -#: wt-status.c:1286 +#: wt-status.c:1299 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1291 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1294 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1296 +#: wt-status.c:1309 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1305 +#: wt-status.c:1318 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1310 +#: wt-status.c:1323 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1313 +#: wt-status.c:1326 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1315 +#: wt-status.c:1328 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1326 +#: wt-status.c:1339 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1330 +#: wt-status.c:1343 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1333 +#: wt-status.c:1346 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1530 +#: wt-status.c:1543 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1536 +#: wt-status.c:1549 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1538 +#: wt-status.c:1551 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1543 +#: wt-status.c:1556 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1545 +#: wt-status.c:1558 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1548 +#: wt-status.c:1561 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1566 +#: wt-status.c:1579 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1580 +#: wt-status.c:1593 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1582 +#: wt-status.c:1595 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1586 +#: wt-status.c:1599 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4311,32 +4586,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1592 +#: wt-status.c:1605 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1594 +#: wt-status.c:1607 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1600 +#: wt-status.c:1613 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1605 +#: wt-status.c:1618 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1608 +#: wt-status.c:1621 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1611 +#: wt-status.c:1624 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4345,71 +4620,69 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1614 +#: wt-status.c:1627 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1617 +#: wt-status.c:1630 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen\n" "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1620 wt-status.c:1625 +#: wt-status.c:1633 wt-status.c:1638 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1623 +#: wt-status.c:1636 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)\n" +msgstr "" +"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " +"anzuzeigen)\n" -#: wt-status.c:1627 +#: wt-status.c:1640 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1734 +#: wt-status.c:1749 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1738 +#: wt-status.c:1753 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1767 -msgid "gone" -msgstr "entfernt" - -#: wt-status.c:1769 wt-status.c:1777 +#: wt-status.c:1782 wt-status.c:1790 msgid "behind " msgstr "hinterher " -#: wt-status.c:1772 wt-status.c:1775 +#: wt-status.c:1785 wt-status.c:1788 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2277 +#: wt-status.c:2280 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind." -#: wt-status.c:2283 +#: wt-status.c:2286 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2285 +#: wt-status.c:2288 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen." -#: compat/precompose_utf8.c:57 builtin/clone.c:414 +#: compat/precompose_utf8.c:57 builtin/clone.c:432 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -4437,7 +4710,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:209 builtin/rev-parse.c:845 +#: builtin/add.c:209 builtin/rev-parse.c:872 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" @@ -4474,9 +4747,9 @@ msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 msgid "dry run" msgstr "Probelauf" @@ -4484,7 +4757,7 @@ msgstr "Probelauf" msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" @@ -4527,11 +4800,11 @@ msgstr "" msgid "check if - even missing - files are ignored in dry run" msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:283 builtin/update-index.c:947 +#: builtin/add.c:283 builtin/update-index.c:951 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:948 +#: builtin/add.c:283 builtin/update-index.c:952 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" @@ -4568,121 +4841,121 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: builtin/am.c:414 +#: builtin/am.c:412 msgid "could not parse author script" msgstr "konnte Autor-Skript nicht parsen" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' wurde durch den applypatch-msg Hook entfernt" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "konnte Patch '%s' nicht parsen" -#: builtin/am.c:840 +#: builtin/am.c:842 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: builtin/am.c:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "ungültiger Zeitstempel" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "Ungültige \"Date\"-Zeile" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "Ungültiger Offset in der Zeitzone" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:989 builtin/clone.c:379 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1127 builtin/commit.c:376 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." -#: builtin/am.c:1176 +#: builtin/am.c:1178 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus." -#: builtin/am.c:1177 +#: builtin/am.c:1179 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1178 +#: builtin/am.c:1180 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, führen Sie \"%s --abort\" aus." -#: builtin/am.c:1316 +#: builtin/am.c:1315 msgid "Patch is empty. Was it split wrong?" msgstr "Patch ist leer. War dessen Aufteilung falsch?" -#: builtin/am.c:1390 builtin/log.c:1550 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/am.c:1417 +#: builtin/am.c:1413 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: builtin/am.c:1610 +#: builtin/am.c:1606 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurückzufallen." -#: builtin/am.c:1612 +#: builtin/am.c:1608 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1631 +#: builtin/am.c:1627 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4690,39 +4963,39 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1637 +#: builtin/am.c:1633 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1662 +#: builtin/am.c:1658 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: builtin/am.c:1686 builtin/merge.c:632 +#: builtin/am.c:1682 builtin/merge.c:631 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: builtin/am.c:1693 +#: builtin/am.c:1689 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 #: builtin/merge.c:827 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1759 +#: builtin/am.c:1755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: builtin/am.c:1764 +#: builtin/am.c:1760 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -4730,35 +5003,35 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1770 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1824 +#: builtin/am.c:1820 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1876 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: builtin/am.c:1885 +#: builtin/am.c:1884 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1890 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s" -#: builtin/am.c:1936 +#: builtin/am.c:1935 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4769,7 +5042,7 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." -#: builtin/am.c:1943 +#: builtin/am.c:1942 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -4777,17 +5050,17 @@ msgstr "" "Sie haben immer noch nicht zusammengeführte Pfade im Index.\n" "Haben Sie vergessen 'git add' zu benutzen?" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:2103 +#: builtin/am.c:2102 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2137 +#: builtin/am.c:2136 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4795,134 +5068,134 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." -#: builtin/am.c:2200 +#: builtin/am.c:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ungültiger Wert für --patch-format: %s" -#: builtin/am.c:2233 +#: builtin/am.c:2232 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "run interactively" msgstr "interaktiv ausführen" -#: builtin/am.c:2242 +#: builtin/am.c:2241 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:178 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2247 +#: builtin/am.c:2246 msgid "add a Signed-off-by line to the commit message" msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2252 +#: builtin/am.c:2251 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo übergeben" -#: builtin/am.c:2254 +#: builtin/am.c:2253 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo übergeben" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo übergeben" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben" -#: builtin/am.c:2261 +#: builtin/am.c:2260 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 +#: builtin/am.c:2292 msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:387 builtin/verify-tag.c:38 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 msgid "format" msgstr "Format" -#: builtin/am.c:2290 +#: builtin/am.c:2289 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben" -#: builtin/am.c:2298 +#: builtin/am.c:2297 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "synonyms for --continue" msgstr "Synonyme für --continue" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2311 +#: builtin/am.c:2310 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/am.c:2316 +#: builtin/am.c:2315 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "(internal use for git-rebase)" msgstr "(intern für git-rebase verwendet)" -#: builtin/am.c:2334 +#: builtin/am.c:2333 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." @@ -4930,16 +5203,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2341 +#: builtin/am.c:2340 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2356 +#: builtin/am.c:2355 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben." -#: builtin/am.c:2380 +#: builtin/am.c:2379 #, c-format msgid "" "Stray %s directory found.\n" @@ -4948,7 +5221,7 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2386 +#: builtin/am.c:2385 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." @@ -4978,11 +5251,6 @@ msgstr "git archive: habe ACK/NAK erwartet, aber EOF bekommen" msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "Fehler am anderen Ende: %s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive: Protokollfehler" @@ -5011,116 +5279,116 @@ msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:1786 +#: builtin/blame.c:1777 msgid "Blaming lines" msgstr "Verarbeite Zeilen" -#: builtin/blame.c:2582 +#: builtin/blame.c:2573 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:2583 +#: builtin/blame.c:2574 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2575 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2576 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:2586 +#: builtin/blame.c:2577 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:2587 +#: builtin/blame.c:2578 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:2588 +#: builtin/blame.c:2579 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2580 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2581 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2591 +#: builtin/blame.c:2582 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2592 +#: builtin/blame.c:2583 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2593 +#: builtin/blame.c:2584 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:2594 +#: builtin/blame.c:2585 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:2595 +#: builtin/blame.c:2586 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:2596 +#: builtin/blame.c:2587 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:2597 +#: builtin/blame.c:2588 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:2604 +#: builtin/blame.c:2595 msgid "Use an experimental heuristic to improve diffs" msgstr "" "eine experimentelle Heuristik zur Verbesserung der Darstellung\n" "von Unterschieden verwenden" -#: builtin/blame.c:2606 +#: builtin/blame.c:2597 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:2607 +#: builtin/blame.c:2598 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2608 +#: builtin/blame.c:2599 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:2609 builtin/blame.c:2610 +#: builtin/blame.c:2600 builtin/blame.c:2601 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2609 +#: builtin/blame.c:2600 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2610 +#: builtin/blame.c:2601 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2611 +#: builtin/blame.c:2602 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2611 +#: builtin/blame.c:2602 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" -#: builtin/blame.c:2658 +#: builtin/blame.c:2649 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" @@ -5132,44 +5400,44 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2706 +#: builtin/blame.c:2697 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren, und 11 Monaten" -#: builtin/blame.c:2786 +#: builtin/blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -#: builtin/blame.c:2806 +#: builtin/blame.c:2797 msgid "cannot use --contents with final commit object name" msgstr "" "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" -#: builtin/blame.c:2811 +#: builtin/blame.c:2802 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse und --first-parent zusammen erfordern die Angabe eines " "endgültigen\n" "Commits" -#: builtin/blame.c:2838 +#: builtin/blame.c:2829 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n" "\"first-parent\"-Kette" -#: builtin/blame.c:2849 +#: builtin/blame.c:2840 #, c-format msgid "no such path %s in %s" msgstr "Pfad %s nicht in %s" -#: builtin/blame.c:2860 +#: builtin/blame.c:2851 #, c-format msgid "cannot read blob %s for path %s" msgstr "kann Blob %s für Pfad '%s' nicht lesen" -#: builtin/blame.c:2879 +#: builtin/blame.c:2870 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -5196,7 +5464,11 @@ msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<Optionen>] [-r | -a] [--points-at]" -#: builtin/branch.c:143 +#: builtin/branch.c:31 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<Optionen>] [-r | -a] [--format]" + +#: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5205,7 +5477,7 @@ msgstr "" "entferne Branch '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengeführt wurde." -#: builtin/branch.c:147 +#: builtin/branch.c:148 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5214,12 +5486,12 @@ msgstr "" "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit HEAD zusammengeführt wurde." -#: builtin/branch.c:161 +#: builtin/branch.c:162 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen." -#: builtin/branch.c:165 +#: builtin/branch.c:166 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5229,166 +5501,94 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:178 +#: builtin/branch.c:179 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:206 +#: builtin/branch.c:210 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:212 +#: builtin/branch.c:216 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:226 +#: builtin/branch.c:230 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." -#: builtin/branch.c:241 +#: builtin/branch.c:245 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:242 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:257 +#: builtin/branch.c:261 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" -#: builtin/branch.c:258 +#: builtin/branch.c:262 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:265 +#: builtin/branch.c:269 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:266 +#: builtin/branch.c:270 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:312 -#, c-format -msgid "[%s: gone]" -msgstr "[%s: entfernt]" - -#: builtin/branch.c:317 -#, c-format -msgid "[%s]" -msgstr "[%s]" - -#: builtin/branch.c:322 -#, c-format -msgid "[%s: behind %d]" -msgstr "[%s: %d hinterher]" - -#: builtin/branch.c:324 -#, c-format -msgid "[behind %d]" -msgstr "[%d hinterher]" - -#: builtin/branch.c:328 -#, c-format -msgid "[%s: ahead %d]" -msgstr "[%s: %d voraus]" - -#: builtin/branch.c:330 -#, c-format -msgid "[ahead %d]" -msgstr "[%d voraus]" - -#: builtin/branch.c:333 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "[%s: %d voraus, %d hinterher]" - -#: builtin/branch.c:336 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "[%d voraus, %d hinterher]" - -#: builtin/branch.c:349 -msgid " **** invalid ref ****" -msgstr " **** ungültige Referenz ****" - -#: builtin/branch.c:375 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(kein Branch, Rebase von Branch %s im Gange)" - -#: builtin/branch.c:378 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(kein Branch, binäre Suche begonnen bei %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: builtin/branch.c:384 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD losgelöst bei %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: builtin/branch.c:389 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD losgelöst von %s)" - -#: builtin/branch.c:393 -msgid "(no branch)" -msgstr "(kein Branch)" - -#: builtin/branch.c:535 +#: builtin/branch.c:441 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Branch %s wird auf %s umgesetzt" -#: builtin/branch.c:539 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -#: builtin/branch.c:554 +#: builtin/branch.c:460 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:564 +#: builtin/branch.c:470 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:581 +#: builtin/branch.c:487 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:585 +#: builtin/branch.c:490 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:588 +#: builtin/branch.c:493 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:595 +#: builtin/branch.c:502 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:611 +#: builtin/branch.c:518 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5399,168 +5599,177 @@ msgstr "" " %s\n" "Zeilen, die mit '%c' beginnen, werden entfernt.\n" -#: builtin/branch.c:643 +#: builtin/branch.c:551 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:645 +#: builtin/branch.c:553 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:646 +#: builtin/branch.c:554 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:647 +#: builtin/branch.c:555 msgid "set up tracking mode (see git-pull(1))" msgstr "den Übernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:649 +#: builtin/branch.c:557 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:651 +#: builtin/branch.c:559 msgid "upstream" msgstr "Upstream" -#: builtin/branch.c:651 +#: builtin/branch.c:559 msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:652 +#: builtin/branch.c:560 msgid "Unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" -#: builtin/branch.c:653 +#: builtin/branch.c:561 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:654 +#: builtin/branch.c:562 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:656 builtin/branch.c:657 +#: builtin/branch.c:564 builtin/branch.c:566 msgid "print only branches that contain the commit" -msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" +msgstr "nur Branches ausgeben, die diesen Commit enthalten" + +#: builtin/branch.c:565 builtin/branch.c:567 +msgid "print only branches that don't contain the commit" +msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten" -#: builtin/branch.c:660 +#: builtin/branch.c:570 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:661 +#: builtin/branch.c:571 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:663 +#: builtin/branch.c:573 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:664 +#: builtin/branch.c:574 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:665 +#: builtin/branch.c:575 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:666 +#: builtin/branch.c:576 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:667 +#: builtin/branch.c:577 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:668 +#: builtin/branch.c:578 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:670 +#: builtin/branch.c:580 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:671 +#: builtin/branch.c:581 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:672 +#: builtin/branch.c:582 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:673 +#: builtin/branch.c:583 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:674 +#: builtin/branch.c:584 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 msgid "key" msgstr "Schüssel" -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:384 +#: builtin/tag.c:429 msgid "object" msgstr "Objekt" -#: builtin/branch.c:679 +#: builtin/branch.c:589 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung" -#: builtin/branch.c:698 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 +#: builtin/verify-tag.c:38 +msgid "format to use for the output" +msgstr "für die Ausgabe zu verwendendes Format" + +#: builtin/branch.c:611 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:702 builtin/clone.c:706 +#: builtin/branch.c:615 builtin/clone.c:724 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:724 +#: builtin/branch.c:638 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:735 builtin/branch.c:787 +#: builtin/branch.c:649 builtin/branch.c:701 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:763 +#: builtin/branch.c:677 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:768 +#: builtin/branch.c:682 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:775 +#: builtin/branch.c:689 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:778 +#: builtin/branch.c:692 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:793 +#: builtin/branch.c:707 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:798 +#: builtin/branch.c:712 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:802 +#: builtin/branch.c:716 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5568,43 +5777,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:809 +#: builtin/branch.c:723 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:821 +#: builtin/branch.c:735 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:825 +#: builtin/branch.c:739 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:831 +#: builtin/branch.c:745 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:845 +#: builtin/branch.c:759 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:851 +#: builtin/branch.c:765 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:854 +#: builtin/branch.c:768 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5613,7 +5822,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:871 +#: builtin/branch.c:785 #, c-format msgid "" "\n" @@ -5624,16 +5833,16 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen " "Sie aus:\n" -#: builtin/bundle.c:51 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s ist in Ordnung\n" -#: builtin/bundle.c:64 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." -#: builtin/bundle.c:68 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." @@ -5681,7 +5890,7 @@ msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" msgid "for blob objects, run filters on object's content" msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen" -#: builtin/cat-file.c:561 git-submodule.sh:929 +#: builtin/cat-file.c:561 git-submodule.sh:943 msgid "blob" msgstr "Blob" @@ -5742,7 +5951,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -5835,9 +6044,9 @@ msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 -#: builtin/worktree.c:471 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 +#: builtin/worktree.c:477 msgid "string" msgstr "Zeichenkette" @@ -5850,114 +6059,114 @@ msgstr "" msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" -#: builtin/checkout.c:25 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<Optionen>] <Branch>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:153 builtin/checkout.c:186 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:155 builtin/checkout.c:188 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:152 +#: builtin/checkout.c:171 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:196 +#: builtin/checkout.c:215 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:213 +#: builtin/checkout.c:232 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:230 +#: builtin/checkout.c:249 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:281 builtin/checkout.c:284 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:268 +#: builtin/checkout.c:287 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:358 builtin/checkout.c:365 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:494 +#: builtin/checkout.c:513 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:625 +#: builtin/checkout.c:644 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:666 +#: builtin/checkout.c:685 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:670 builtin/clone.c:660 +#: builtin/checkout.c:689 builtin/clone.c:678 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:674 +#: builtin/checkout.c:693 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:696 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:681 +#: builtin/checkout.c:700 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:683 builtin/checkout.c:1072 +#: builtin/checkout.c:702 builtin/checkout.c:1090 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:704 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:736 +#: builtin/checkout.c:755 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:742 +#: builtin/checkout.c:761 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5980,7 +6189,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:780 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6007,152 +6216,152 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:797 +#: builtin/checkout.c:816 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:801 +#: builtin/checkout.c:820 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:828 builtin/checkout.c:1067 +#: builtin/checkout.c:847 builtin/checkout.c:1085 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch geboren wird" -#: builtin/checkout.c:973 +#: builtin/checkout.c:991 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1013 builtin/worktree.c:214 +#: builtin/checkout.c:1031 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1060 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1099 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1084 builtin/checkout.c:1088 +#: builtin/checkout.c:1102 builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 +#: builtin/checkout.c:1121 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1126 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 -#: builtin/worktree.c:326 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1160 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1162 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1163 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1146 builtin/worktree.c:328 +#: builtin/checkout.c:1164 builtin/worktree.c:333 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1165 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1167 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1167 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1168 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1170 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1172 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1173 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1156 builtin/merge.c:235 +#: builtin/checkout.c:1174 builtin/merge.c:234 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1176 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1179 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1183 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:168 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 +#: builtin/send-pack.c:172 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1224 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1241 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1246 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1282 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1289 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -6162,12 +6371,12 @@ msgstr "" "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst " "werden kann?" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1294 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1271 +#: builtin/checkout.c:1298 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6206,7 +6415,7 @@ msgstr "Würde Repository %s überspringen\n" msgid "failed to remove %s" msgstr "Fehler beim Löschen von %s" -#: builtin/clean.c:291 git-add--interactive.perl:623 +#: builtin/clean.c:297 git-add--interactive.perl:614 #, c-format msgid "" "Prompt help:\n" @@ -6219,7 +6428,7 @@ msgstr "" "foo - Element anhand eines eindeutigen Präfix auswählen\n" " - (leer) nichts auswählen\n" -#: builtin/clean.c:295 git-add--interactive.perl:632 +#: builtin/clean.c:301 git-add--interactive.perl:623 #, c-format msgid "" "Prompt help:\n" @@ -6240,38 +6449,38 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden\n" -#: builtin/clean.c:511 git-add--interactive.perl:598 -#: git-add--interactive.perl:603 +#: builtin/clean.c:517 git-add--interactive.perl:589 +#: git-add--interactive.perl:594 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" -#: builtin/clean.c:653 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Ignorier-Muster eingeben>> " -#: builtin/clean.c:690 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" -#: builtin/clean.c:711 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:752 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:777 git-add--interactive.perl:1669 +#: builtin/clean.c:783 git-add--interactive.perl:1660 #, c-format msgid "Bye.\n" msgstr "Tschüss.\n" -#: builtin/clean.c:785 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6289,62 +6498,63 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:812 git-add--interactive.perl:1745 +#: builtin/clean.c:818 git-add--interactive.perl:1736 msgid "*** Commands ***" msgstr "*** Befehle ***" -#: builtin/clean.c:813 git-add--interactive.perl:1742 +#: builtin/clean.c:819 git-add--interactive.perl:1733 msgid "What now" msgstr "Was nun" -#: builtin/clean.c:821 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" msgstr[1] "Würde die folgenden Elemente entfernen:" -#: builtin/clean.c:838 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:869 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:871 +#: builtin/clean.c:877 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:872 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:874 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 +#: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:876 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:877 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:879 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:897 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:901 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6352,7 +6562,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:904 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6364,135 +6574,140 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:65 +#: builtin/clone.c:80 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:70 +#: builtin/clone.c:85 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:72 +#: builtin/clone.c:87 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:74 +#: builtin/clone.c:89 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:76 +#: builtin/clone.c:91 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:78 builtin/clone.c:80 +#: builtin/clone.c:93 builtin/clone.c:97 +msgid "pathspec" +msgstr "Pfadspezifikation" + +#: builtin/clone.c:93 builtin/clone.c:97 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:82 +#: builtin/clone.c:100 msgid "number of submodules cloned in parallel" msgstr "Anzahl der parallel zu klonenden Submodule" -#: builtin/clone.c:83 builtin/init-db.c:475 +#: builtin/clone.c:101 builtin/init-db.c:475 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:84 builtin/init-db.c:476 +#: builtin/clone.c:102 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 -#: builtin/submodule--helper.c:970 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:90 +#: builtin/clone.c:108 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 msgid "name" msgstr "Name" -#: builtin/clone.c:92 +#: builtin/clone.c:110 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:94 +#: builtin/clone.c:112 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:96 +#: builtin/clone.c:114 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 +#: builtin/pull.c:202 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:98 +#: builtin/clone.c:116 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 #: parse-options.h:142 msgid "time" msgstr "Zeit" -#: builtin/clone.c:100 +#: builtin/clone.c:118 msgid "create a shallow clone since a specific time" msgstr "" "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten " "Zeit\n" "erstellen" -#: builtin/clone.c:101 builtin/fetch.c:124 +#: builtin/clone.c:119 builtin/fetch.c:124 msgid "revision" msgstr "Commit" -#: builtin/clone.c:102 builtin/fetch.c:125 +#: builtin/clone.c:120 builtin/fetch.c:125 msgid "deepen history of shallow clone, excluding rev" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" "Ausschluss eines Commits vertiefen" -#: builtin/clone.c:104 +#: builtin/clone.c:122 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:106 +#: builtin/clone.c:124 msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" -#: builtin/clone.c:107 builtin/init-db.c:484 +#: builtin/clone.c:125 builtin/init-db.c:484 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:108 builtin/init-db.c:485 +#: builtin/clone.c:126 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:109 +#: builtin/clone.c:127 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:110 +#: builtin/clone.c:128 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" -#: builtin/clone.c:250 +#: builtin/clone.c:268 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6500,42 +6715,42 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:303 +#: builtin/clone.c:321 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" -#: builtin/clone.c:375 +#: builtin/clone.c:393 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: builtin/clone.c:383 +#: builtin/clone.c:401 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:397 +#: builtin/clone.c:415 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:419 +#: builtin/clone.c:437 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:423 +#: builtin/clone.c:441 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:448 +#: builtin/clone.c:466 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:460 +#: builtin/clone.c:478 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6545,102 +6760,101 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:537 +#: builtin/clone.c:555 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:632 +#: builtin/clone.c:650 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:648 +#: builtin/clone.c:666 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:697 +#: builtin/clone.c:715 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:728 +#: builtin/clone.c:746 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:768 +#: builtin/clone.c:786 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:831 +#: builtin/clone.c:849 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:833 +#: builtin/clone.c:851 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:866 builtin/receive-pack.c:1895 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:870 +#: builtin/clone.c:888 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:883 +#: builtin/clone.c:901 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:886 +#: builtin/clone.c:904 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:899 +#: builtin/clone.c:917 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:905 builtin/fetch.c:1335 +#: builtin/clone.c:923 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:915 +#: builtin/clone.c:933 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:925 +#: builtin/clone.c:943 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 -#: builtin/submodule--helper.c:659 builtin/worktree.c:222 -#: builtin/worktree.c:249 +#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:943 +#: builtin/clone.c:961 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:955 +#: builtin/clone.c:973 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:957 +#: builtin/clone.c:975 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:963 +#: builtin/clone.c:999 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6648,45 +6862,45 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1019 +#: builtin/clone.c:1055 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:1021 +#: builtin/clone.c:1057 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1023 +#: builtin/clone.c:1059 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1026 +#: builtin/clone.c:1062 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:1031 +#: builtin/clone.c:1067 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1035 +#: builtin/clone.c:1071 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:1090 builtin/clone.c:1098 +#: builtin/clone.c:1126 builtin/clone.c:1134 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1101 +#: builtin/clone.c:1137 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -6884,11 +7098,6 @@ msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:611 -#, c-format -msgid "invalid date format: %s" -msgstr "Ungültiges Datumsformat: %s" - #: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" @@ -6902,7 +7111,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:704 builtin/shortlog.c:295 +#: builtin/commit.c:704 builtin/shortlog.c:294 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" @@ -7004,7 +7213,7 @@ msgstr "Kann Index nicht lesen" msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:968 builtin/tag.c:280 +#: builtin/commit.c:968 builtin/tag.c:273 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -7078,7 +7287,7 @@ msgstr "" msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" -#: builtin/commit.c:1224 builtin/tag.c:495 +#: builtin/commit.c:1224 builtin/tag.c:551 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" @@ -7100,7 +7309,7 @@ msgid "version" msgstr "Version" #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:442 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" @@ -7113,7 +7322,7 @@ msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:368 +#: builtin/fast-export.c:984 builtin/tag.c:411 msgid "mode" msgstr "Modus" @@ -7171,7 +7380,7 @@ msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1586 builtin/tag.c:366 +#: builtin/commit.c:1586 builtin/tag.c:409 msgid "read message from file" msgstr "Beschreibung von Datei lesen" @@ -7183,7 +7392,7 @@ msgstr "Autor" msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1588 builtin/gc.c:333 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "Datum" @@ -7191,8 +7400,8 @@ msgstr "Datum" msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:364 +#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:407 msgid "message" msgstr "Beschreibung" @@ -7201,7 +7410,7 @@ msgid "commit message" msgstr "Commit-Beschreibung" #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "Commit" @@ -7229,7 +7438,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" @@ -7245,7 +7454,7 @@ msgstr "Bearbeitung des Commits erzwingen" msgid "default" msgstr "Standard" -#: builtin/commit.c:1598 builtin/tag.c:369 +#: builtin/commit.c:1598 builtin/tag.c:412 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" @@ -7254,8 +7463,8 @@ msgstr "" msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 -#: builtin/revert.c:93 +#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 +#: builtin/revert.c:112 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" @@ -7350,141 +7559,141 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<Optionen>]" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "Config file location" msgstr "Ort der Konfigurationsdatei" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use global config file" msgstr "globale Konfigurationsdatei verwenden" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use system config file" msgstr "systemweite Konfigurationsdatei verwenden" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use repository config file" msgstr "Konfigurationsdatei des Repositories verwenden" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use given config file" msgstr "die angegebene Konfigurationsdatei verwenden" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "blob-id" msgstr "Blob-Id" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "Action" msgstr "Aktion" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "Wert zurückgeben: Name [Wert-regex]" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "neue Variable hinzufügen: Name Wert" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "eine Variable entfernen: Name [Wert-regex]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "eine Sektion umbenennen: alter-Name neuer-Name" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "eine Sektion entfernen: Name" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "list all" msgstr "alles auflisten" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "open an editor" msgstr "einen Editor öffnen" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "die konfigurierte Farbe finden: Slot [Standard]" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "Type" msgstr "Typ" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "Wert ist \"true\" oder \"false\"" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "Wert ist eine Dezimalzahl" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "Wert ist --bool oder --int" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "Other" msgstr "Sonstiges" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "schließt Werte mit NUL-Byte ab" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " "Befehlszeile)" -#: builtin/config.c:327 +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:471 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7499,12 +7708,12 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:613 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." -#: builtin/config.c:625 +#: builtin/config.c:627 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7522,67 +7731,67 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] --dirty" msgstr "git describe [<Optionen>] --dirty" -#: builtin/describe.c:52 +#: builtin/describe.c:53 msgid "head" msgstr "Branch" -#: builtin/describe.c:52 +#: builtin/describe.c:53 msgid "lightweight" msgstr "nicht-annotiert" -#: builtin/describe.c:52 +#: builtin/describe.c:53 msgid "annotated" msgstr "annotiert" -#: builtin/describe.c:249 +#: builtin/describe.c:250 #, c-format msgid "annotated tag %s not available" msgstr "annotiertes Tag %s ist nicht verfügbar" -#: builtin/describe.c:221 +#: builtin/describe.c:254 #, c-format msgid "annotated tag %s has no embedded name" msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" -#: builtin/describe.c:223 +#: builtin/describe.c:256 #, c-format msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:250 builtin/log.c:480 +#: builtin/describe.c:283 builtin/log.c:487 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" -#: builtin/describe.c:253 +#: builtin/describe.c:286 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gültiges '%s' Objekt" -#: builtin/describe.c:270 +#: builtin/describe.c:303 #, c-format msgid "no tag exactly matches '%s'" msgstr "kein Tag entspricht exakt '%s'" -#: builtin/describe.c:272 +#: builtin/describe.c:305 #, c-format msgid "searching to describe %s\n" msgstr "suche zur Beschreibung von %s\n" -#: builtin/describe.c:319 +#: builtin/describe.c:352 #, c-format msgid "finished search at %s\n" msgstr "beendete Suche bei %s\n" -#: builtin/describe.c:346 +#: builtin/describe.c:379 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7591,7 +7800,7 @@ msgstr "" "Keine annotierten Tags können '%s' beschreiben.\n" "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags." -#: builtin/describe.c:350 +#: builtin/describe.c:383 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7600,82 +7809,96 @@ msgstr "" "Keine Tags können '%s' beschreiben.\n" "Versuchen Sie --always oder erstellen Sie einige Tags." -#: builtin/describe.c:371 +#: builtin/describe.c:413 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:374 +#: builtin/describe.c:416 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -"mehr als %i Tags gefunden; Führe die ersten %i auf\n" +"mehr als %i Tags gefunden; führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" -#: builtin/describe.c:396 +#: builtin/describe.c:438 msgid "find the tag that comes after the commit" msgstr "das Tag finden, das nach dem Commit kommt" -#: builtin/describe.c:397 +#: builtin/describe.c:439 msgid "debug search strategy on stderr" msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren" -#: builtin/describe.c:398 +#: builtin/describe.c:440 msgid "use any ref" msgstr "alle Referenzen verwenden" -#: builtin/describe.c:399 +#: builtin/describe.c:441 msgid "use any tag, even unannotated" msgstr "jedes Tag verwenden, auch nicht-annotierte" -#: builtin/describe.c:400 +#: builtin/describe.c:442 msgid "always use long format" msgstr "immer langes Format verwenden" -#: builtin/describe.c:401 +#: builtin/describe.c:443 msgid "only follow first parent" msgstr "nur erstem Elternteil folgen" -#: builtin/describe.c:404 +#: builtin/describe.c:446 msgid "only output exact matches" msgstr "nur exakte Übereinstimmungen ausgeben" -#: builtin/describe.c:406 +#: builtin/describe.c:448 msgid "consider <n> most recent tags (default: 10)" msgstr "die jüngsten <n> Tags betrachten (Standard: 10)" -#: builtin/describe.c:408 +#: builtin/describe.c:450 msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:410 builtin/name-rev.c:320 +#: builtin/describe.c:452 +msgid "do not consider tags matching <pattern>" +msgstr "keine Tags betrachten, die <Muster> entsprechen" + +#: builtin/describe.c:454 builtin/name-rev.c:357 msgid "show abbreviated commit object as fallback" msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" -#: builtin/describe.c:411 +#: builtin/describe.c:455 builtin/describe.c:458 msgid "mark" msgstr "Kennzeichen" -#: builtin/describe.c:412 +#: builtin/describe.c:456 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -"<Kennzeichen> bei geändertem Arbeitsverzeichnis hinzufügen (Standard: \"-" -"dirty\")" +"<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" +"\")" -#: builtin/describe.c:430 +#: builtin/describe.c:459 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "" +"<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken" +"\")" + +#: builtin/describe.c:477 msgid "--long is incompatible with --abbrev=0" msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." -#: builtin/describe.c:456 +#: builtin/describe.c:506 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:476 +#: builtin/describe.c:549 msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." +#: builtin/describe.c:551 +msgid "--broken is incompatible with commit-ishes" +msgstr "Die Option --broken kann nicht mit Commits verwendet werden." + #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" @@ -7714,7 +7937,22 @@ msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]" msgid "failed: %d" msgstr "fehlgeschlagen: %d" -#: builtin/difftool.c:342 +#: builtin/difftool.c:283 +#, c-format +msgid "could not read symlink %s" +msgstr "konnte symbolische Verknüpfung %s nicht lesen" + +#: builtin/difftool.c:285 +#, c-format +msgid "could not read symlink file %s" +msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen." + +#: builtin/difftool.c:293 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen." + +#: builtin/difftool.c:395 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7722,73 +7960,75 @@ msgstr "" "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n" "Diff-Modus('-d' und '--dir-diff') nicht unterstützt." -#: builtin/difftool.c:567 +#: builtin/difftool.c:609 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "beide Dateien geändert: '%s' und '%s'." -#: builtin/difftool.c:569 +#: builtin/difftool.c:611 msgid "working tree file has been left." msgstr "Datei im Arbeitsverzeichnis belassen." -#: builtin/difftool.c:580 +#: builtin/difftool.c:622 #, c-format msgid "temporary files exist in '%s'." msgstr "Es existieren temporäre Dateien in '%s'." -#: builtin/difftool.c:581 +#: builtin/difftool.c:623 msgid "you may want to cleanup or recover these." msgstr "Sie könnten diese aufräumen oder wiederherstellen." -#: builtin/difftool.c:626 +#: builtin/difftool.c:669 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.guitool` anstatt `diff.tool` benutzen" -#: builtin/difftool.c:628 +#: builtin/difftool.c:671 msgid "perform a full-directory diff" msgstr "Diff über ganzes Verzeichnis ausführen" -#: builtin/difftool.c:630 +#: builtin/difftool.c:673 msgid "do not prompt before launching a diff tool" msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools" -#: builtin/difftool.c:636 +#: builtin/difftool.c:679 msgid "use symlinks in dir-diff mode" msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden" -#: builtin/difftool.c:637 +#: builtin/difftool.c:680 msgid "<tool>" msgstr "<Tool>" -#: builtin/difftool.c:638 +#: builtin/difftool.c:681 msgid "use the specified diff tool" msgstr "das angegebene Diff-Tool benutzen" -#: builtin/difftool.c:640 +#: builtin/difftool.c:683 msgid "print a list of diff tools that may be used with `--tool`" -msgstr "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können" +msgstr "" +"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können" -#: builtin/difftool.c:643 +#: builtin/difftool.c:686 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Rückkehrwert\n" +"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem " +"Rückkehrwert\n" "verschieden 0 ausgeführt wurde" -#: builtin/difftool.c:645 +#: builtin/difftool.c:688 msgid "<command>" msgstr "<Programm>" -#: builtin/difftool.c:646 +#: builtin/difftool.c:689 msgid "specify a custom command for viewing diffs" msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben" -#: builtin/difftool.c:670 +#: builtin/difftool.c:713 msgid "no <tool> given for --tool=<tool>" msgstr "kein <Tool> für --tool=<Tool> angegeben" -#: builtin/difftool.c:677 +#: builtin/difftool.c:720 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" @@ -7930,7 +8170,7 @@ msgstr "" msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:131 builtin/log.c:1433 +#: builtin/fetch.c:131 builtin/log.c:1440 msgid "dir" msgstr "Verzeichnis" @@ -7958,75 +8198,75 @@ msgstr "Refmap für 'fetch' angeben" msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:511 +#: builtin/fetch.c:513 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthält ungültigen Wert %s" -#: builtin/fetch.c:604 +#: builtin/fetch.c:606 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:608 +#: builtin/fetch.c:610 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:621 builtin/fetch.c:701 +#: builtin/fetch.c:623 builtin/fetch.c:703 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:622 +#: builtin/fetch.c:624 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" -#: builtin/fetch.c:631 +#: builtin/fetch.c:633 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 -#: builtin/fetch.c:696 +#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 +#: builtin/fetch.c:698 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:651 +#: builtin/fetch.c:653 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:654 +#: builtin/fetch.c:656 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:659 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:696 +#: builtin/fetch.c:698 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:701 +#: builtin/fetch.c:703 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:746 +#: builtin/fetch.c:748 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:766 +#: builtin/fetch.c:768 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit " "unvollständiger Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:853 builtin/fetch.c:949 +#: builtin/fetch.c:855 builtin/fetch.c:951 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:864 +#: builtin/fetch.c:866 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8035,57 +8275,57 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:919 +#: builtin/fetch.c:921 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:920 +#: builtin/fetch.c:922 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:952 +#: builtin/fetch.c:954 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:953 builtin/remote.c:1020 +#: builtin/fetch.c:955 builtin/remote.c:1022 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:978 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:995 +#: builtin/fetch.c:997 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:998 +#: builtin/fetch.c:1000 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1076 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:1234 +#: builtin/fetch.c:1236 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1236 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1254 +#: builtin/fetch.c:1256 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8094,43 +8334,43 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1279 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1321 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstützt." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1323 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schließen sich gegenseitig aus" -#: builtin/fetch.c:1326 +#: builtin/fetch.c:1328 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1330 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1352 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1354 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1363 +#: builtin/fetch.c:1365 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1371 +#: builtin/fetch.c:1373 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" @@ -8172,12 +8412,12 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <Objekt>]" #: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<Objekt>]]" +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<Commit>]]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [--contains [<object>]]" -msgstr "git for-each-ref [--contains [<Objekt>]]" +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]" #: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" @@ -8199,10 +8439,6 @@ msgstr "Platzhalter als Tcl-String formatieren" msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 -msgid "format to use for the output" -msgstr "für die Ausgabe zu verwendendes Format" - #: builtin/for-each-ref.c:41 msgid "print only refs which points at the given object" msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben" @@ -8219,6 +8455,10 @@ msgstr "nur nicht zusammengeführte Referenzen ausgeben" msgid "print only refs which contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" +#: builtin/for-each-ref.c:46 +msgid "print only refs which don't contain the commit" +msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" + #: builtin/fsck.c:554 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" @@ -8283,17 +8523,17 @@ msgstr "Prüfe Objekte" msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:72 +#: builtin/gc.c:78 #, c-format -msgid "Invalid %s: '%s'" -msgstr "Ungültiger %s: '%s'" +msgid "Failed to fstat %s: %s" +msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:139 +#: builtin/gc.c:310 #, c-format -msgid "insanely long object directory %.*s" -msgstr "zu langes Objekt-Verzeichnis %.*s" +msgid "Can't stat %s" +msgstr "Kann '%s' nicht lesen." -#: builtin/gc.c:297 +#: builtin/gc.c:319 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8309,44 +8549,49 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:334 +#: builtin/gc.c:358 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:336 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:337 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:338 +#: builtin/gc.c:362 msgid "force running gc even if there may be another gc running" msgstr "" "Ausführung von \"git gc\" erwzingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:380 +#: builtin/gc.c:379 +#, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry" + +#: builtin/gc.c:407 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Die Datenbank des Repositories wird für eine optimale Performance im\n" "Hintergrund komprimiert.\n" -#: builtin/gc.c:382 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance " "komprimiert.\n" -#: builtin/gc.c:383 +#: builtin/gc.c:410 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n" -#: builtin/gc.c:404 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8354,7 +8599,7 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:448 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8375,247 +8620,250 @@ msgstr "grep: Fehler beim Erzeugen eines Thread: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" -#: builtin/grep.c:763 builtin/grep.c:804 +#: builtin/grep.c:769 builtin/grep.c:810 #, c-format msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" -#: builtin/grep.c:823 +#: builtin/grep.c:829 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:887 +#: builtin/grep.c:893 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:973 +#: builtin/grep.c:980 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:975 +#: builtin/grep.c:982 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:977 +#: builtin/grep.c:984 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:979 +#: builtin/grep.c:986 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:981 -msgid "recursivley search in each submodule" +#: builtin/grep.c:988 +msgid "recursively search in each submodule" msgstr "rekursive Suche in jedem Submodul" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "basename" msgstr "Basisname" -#: builtin/grep.c:984 +#: builtin/grep.c:991 msgid "prepend parent project's basename to output" msgstr "Basisname des Elternprojektes an Ausgaben voranstellen" -#: builtin/grep.c:987 +#: builtin/grep.c:994 msgid "show non-matching lines" msgstr "Zeilen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:989 +#: builtin/grep.c:996 msgid "case insensitive matching" msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden" -#: builtin/grep.c:991 +#: builtin/grep.c:998 msgid "match patterns only at word boundaries" msgstr "nur ganze Wörter suchen" -#: builtin/grep.c:993 +#: builtin/grep.c:1000 msgid "process binary files as text" msgstr "binäre Dateien als Text verarbeiten" -#: builtin/grep.c:995 +#: builtin/grep.c:1002 msgid "don't match patterns in binary files" msgstr "keine Muster in Binärdateien finden" -#: builtin/grep.c:998 +#: builtin/grep.c:1005 msgid "process binary files with textconv filters" msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:1000 +#: builtin/grep.c:1007 msgid "descend at most <depth> levels" msgstr "höchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:1004 +#: builtin/grep.c:1011 msgid "use extended POSIX regular expressions" msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" -#: builtin/grep.c:1007 +#: builtin/grep.c:1014 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" -#: builtin/grep.c:1010 +#: builtin/grep.c:1017 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:1013 +#: builtin/grep.c:1020 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible reguläre Ausdrücke verwenden" -#: builtin/grep.c:1016 +#: builtin/grep.c:1023 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:1017 +#: builtin/grep.c:1024 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:1018 +#: builtin/grep.c:1025 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:1020 +#: builtin/grep.c:1027 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:1022 +#: builtin/grep.c:1029 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" -#: builtin/grep.c:1024 +#: builtin/grep.c:1031 msgid "synonym for --files-with-matches" msgstr "Synonym für --files-with-matches" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:1029 +#: builtin/grep.c:1036 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:1031 +#: builtin/grep.c:1038 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:1032 +#: builtin/grep.c:1039 msgid "highlight matches" msgstr "Übereinstimmungen hervorheben" -#: builtin/grep.c:1034 +#: builtin/grep.c:1041 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:1036 +#: builtin/grep.c:1043 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:1039 +#: builtin/grep.c:1046 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:1042 +#: builtin/grep.c:1049 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen" -#: builtin/grep.c:1044 +#: builtin/grep.c:1051 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:1046 +#: builtin/grep.c:1053 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:1047 +#: builtin/grep.c:1054 msgid "shortcut for -C NUM" msgstr "Kurzform für -C NUM" -#: builtin/grep.c:1050 +#: builtin/grep.c:1057 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen" -#: builtin/grep.c:1052 +#: builtin/grep.c:1059 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:1055 +#: builtin/grep.c:1062 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:1057 +#: builtin/grep.c:1064 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:1059 +#: builtin/grep.c:1066 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:1071 +#: builtin/grep.c:1078 msgid "indicate hit with exit status without output" msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:1073 +#: builtin/grep.c:1080 msgid "show only matches from files that match all patterns" msgstr "" "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:1075 +#: builtin/grep.c:1082 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:1079 +#: builtin/grep.c:1086 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:1079 +#: builtin/grep.c:1086 msgid "show matching files in the pager" msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:1082 +#: builtin/grep.c:1089 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:1146 +#: builtin/grep.c:1153 msgid "no pattern given." msgstr "keine Muster angegeben" -#: builtin/grep.c:1178 builtin/index-pack.c:1482 +#: builtin/grep.c:1189 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden" + +#: builtin/grep.c:1195 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "Konnte Commit nicht auflösen: %s" + +#: builtin/grep.c:1228 builtin/index-pack.c:1485 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:1215 +#: builtin/grep.c:1251 msgid "--open-files-in-pager only works on the worktree" msgstr "" "Die Option --open-files-in-pager kann nur innerhalb des " "Arbeitsverzeichnisses verwendet werden." -#: builtin/grep.c:1238 +#: builtin/grep.c:1274 msgid "option not supported with --recurse-submodules." msgstr "Option wird mit --recurse-submodules nicht unterstützt." -#: builtin/grep.c:1244 +#: builtin/grep.c:1280 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "Die Optionen --cached und --untracked können nicht mit --no-index verwendet " "werden." -#: builtin/grep.c:1249 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "" -"Die Optionen --no-index und --untracked können nicht mit Commits verwendet " -"werden." - -#: builtin/grep.c:1252 +#: builtin/grep.c:1286 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten " "verwendet werden." -#: builtin/grep.c:1260 +#: builtin/grep.c:1294 msgid "both --cached and trees are given." msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." @@ -8842,241 +9090,246 @@ msgstr "Paket überschreitet die maximal erlaubte Größe" msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: builtin/index-pack.c:322 +#: builtin/index-pack.c:323 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:336 +#: builtin/index-pack.c:337 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstützt" -#: builtin/index-pack.c:356 +#: builtin/index-pack.c:357 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s" -#: builtin/index-pack.c:478 +#: builtin/index-pack.c:479 #, c-format msgid "inflate returned %d" msgstr "Dekomprimierung gab %d zurück" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:528 msgid "offset value overflow for delta base object" msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" -#: builtin/index-pack.c:535 +#: builtin/index-pack.c:536 msgid "delta base offset is out of bound" msgstr "" "Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs" -#: builtin/index-pack.c:543 +#: builtin/index-pack.c:544 #, c-format msgid "unknown object type %d" msgstr "Unbekannter Objekt-Typ %d" -#: builtin/index-pack.c:574 +#: builtin/index-pack.c:575 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:577 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte" msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes" -#: builtin/index-pack.c:602 +#: builtin/index-pack.c:603 msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:813 builtin/index-pack.c:822 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:752 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:257 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:819 +#: builtin/index-pack.c:814 +#, c-format +msgid "cannot read existing object info %s" +msgstr "Kann existierende Informationen zu Objekt %s nicht lesen." + +#: builtin/index-pack.c:822 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:836 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:853 msgid "Error in object" msgstr "Fehler in Objekt" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:855 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:924 builtin/index-pack.c:955 +#: builtin/index-pack.c:927 builtin/index-pack.c:958 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1128 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1128 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1165 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1168 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1176 +#: builtin/index-pack.c:1179 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1199 +#: builtin/index-pack.c:1202 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1213 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1258 +#: builtin/index-pack.c:1261 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "abgeschlossen mit %d lokalem Objekt" msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1273 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1277 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1301 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1377 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1403 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1411 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1423 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1432 +#: builtin/index-pack.c:1433 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1443 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1479 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 +#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1547 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1546 +#: builtin/index-pack.c:1549 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1600 +#: builtin/index-pack.c:1603 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1613 +#: builtin/index-pack.c:1616 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 -#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 +#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 +#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1734 +#: builtin/index-pack.c:1737 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1736 +#: builtin/index-pack.c:1739 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1747 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -9236,104 +9489,104 @@ msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:84 +#: builtin/log.c:89 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:139 +#: builtin/log.c:144 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrücken" -#: builtin/log.c:140 +#: builtin/log.c:145 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:141 +#: builtin/log.c:146 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:142 +#: builtin/log.c:147 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:145 +#: builtin/log.c:150 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" -#: builtin/log.c:241 +#: builtin/log.c:246 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:486 +#: builtin/log.c:493 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:500 builtin/log.c:594 +#: builtin/log.c:507 builtin/log.c:601 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:618 +#: builtin/log.c:625 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:739 +#: builtin/log.c:746 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:839 +#: builtin/log.c:846 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:854 +#: builtin/log.c:861 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:868 +#: builtin/log.c:875 msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:878 +#: builtin/log.c:885 msgid "Not a range." msgstr "Kein Commit-Bereich." -#: builtin/log.c:984 +#: builtin/log.c:991 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1063 +#: builtin/log.c:1071 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1091 +#: builtin/log.c:1098 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1141 +#: builtin/log.c:1148 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 +#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 +#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/log.c:1263 +#: builtin/log.c:1270 msgid "Could not find exact merge base." msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1267 +#: builtin/log.c:1274 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" @@ -9344,216 +9597,216 @@ msgstr "" "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." -#: builtin/log.c:1287 +#: builtin/log.c:1294 msgid "Failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1298 +#: builtin/log.c:1305 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." -#: builtin/log.c:1302 +#: builtin/log.c:1309 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1351 +#: builtin/log.c:1358 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1408 +#: builtin/log.c:1415 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1411 +#: builtin/log.c:1418 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1415 +#: builtin/log.c:1422 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1417 +#: builtin/log.c:1424 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1419 +#: builtin/log.c:1426 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1420 +#: builtin/log.c:1427 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1421 +#: builtin/log.c:1428 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1423 +#: builtin/log.c:1430 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1425 +#: builtin/log.c:1432 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1427 +#: builtin/log.c:1434 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[RFC PATCH] anstatt [PATCH] verwenden" -#: builtin/log.c:1430 +#: builtin/log.c:1437 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1433 +#: builtin/log.c:1440 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1439 +#: builtin/log.c:1446 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "header" msgstr "Header" -#: builtin/log.c:1449 +#: builtin/log.c:1456 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1450 builtin/log.c:1452 +#: builtin/log.c:1457 builtin/log.c:1459 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1452 +#: builtin/log.c:1459 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1454 +#: builtin/log.c:1461 msgid "ident" msgstr "Ident" -#: builtin/log.c:1455 +#: builtin/log.c:1462 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1457 +#: builtin/log.c:1464 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1458 +#: builtin/log.c:1465 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1459 builtin/log.c:1462 +#: builtin/log.c:1466 builtin/log.c:1469 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1469 +#: builtin/log.c:1476 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" -#: builtin/log.c:1474 +#: builtin/log.c:1481 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1565 +#: builtin/log.c:1572 msgid "-n and -k are mutually exclusive." msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1567 +#: builtin/log.c:1574 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus." -#: builtin/log.c:1575 +#: builtin/log.c:1582 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1577 +#: builtin/log.c:1584 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1579 +#: builtin/log.c:1586 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1609 +#: builtin/log.c:1616 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1611 +#: builtin/log.c:1618 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1705 +#: builtin/log.c:1712 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1777 +#: builtin/log.c:1784 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1826 +#: builtin/log.c:1833 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1880 +#: builtin/log.c:1887 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9561,108 +9814,108 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "den Dateistatus mit Tags anzeigen" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "entfernte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "geänderte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "sonstige Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "ignorierte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:524 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "" "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " "anzeigen" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:534 msgid "show files on the filesystem that need to be removed" msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "Zeilenenden von Dateien anzeigen" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "keine leeren Verzeichnisse anzeigen" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "'resolve-undo' Informationen anzeigen" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "Dateien auslassen, die einem Muster entsprechen" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "Muster, gelesen von <Datei>, ausschließen" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "Rekursion in Submodulen durchführen" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:563 msgid "if any <file> is not in the index, treat this as an error" msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "Commit-Referenz" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" @@ -9676,41 +9929,41 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<Repository> [<Referenzen>...]]" -#: builtin/ls-remote.c:50 +#: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "URL des Remote-Repositories nicht ausgeben" -#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "Programm" -#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/ls-remote.c:56 +#: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "auf Tags einschränken" -#: builtin/ls-remote.c:57 +#: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "auf Branches einschränken" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "keine Tags anzeigen, die andere Tags enthalten" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:62 msgid "take url.<base>.insteadOf into account" msgstr "url.<Basis>.insteadOf berücksichtigen" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:64 msgid "exit with exit code 2 if no matching refs are found" msgstr "" "mit Rückkehrwert 2 beenden, wenn keine übereinstimmenden Referenzen\n" "gefunden wurden" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:66 msgid "show underlying ref in addition to the object pointed by it" msgstr "zusätzlich die auf durch dieses Objekt verwiesene Referenzen anzeigen" @@ -9757,149 +10010,145 @@ msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" #: builtin/merge.c:47 -msgid "git merge [<options>] <msg> HEAD <commit>" -msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" - -#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:48 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:103 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:141 +#: builtin/merge.c:140 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:147 +#: builtin/merge.c:146 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:197 builtin/pull.c:127 +#: builtin/merge.c:196 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:200 builtin/pull.c:130 +#: builtin/merge.c:199 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:201 builtin/pull.c:133 +#: builtin/merge.c:200 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:203 builtin/pull.c:136 +#: builtin/merge.c:202 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufügen" -#: builtin/merge.c:206 builtin/pull.c:139 +#: builtin/merge.c:205 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:208 builtin/pull.c:142 +#: builtin/merge.c:207 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:210 builtin/pull.c:145 +#: builtin/merge.c:209 builtin/pull.c:145 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:211 +#: builtin/merge.c:210 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:213 builtin/pull.c:151 +#: builtin/merge.c:212 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:217 builtin/pull.c:154 +#: builtin/merge.c:216 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 -#: builtin/revert.c:89 +#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 +#: builtin/revert.c:108 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:219 builtin/pull.c:159 +#: builtin/merge.c:218 builtin/pull.c:159 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:220 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:221 builtin/pull.c:163 +#: builtin/merge.c:220 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:223 +#: builtin/merge.c:222 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:227 +#: builtin/merge.c:226 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:229 +#: builtin/merge.c:228 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:231 builtin/pull.c:170 +#: builtin/merge.c:230 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:259 +#: builtin/merge.c:258 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:264 +#: builtin/merge.c:263 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:269 +#: builtin/merge.c:268 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:287 builtin/merge.c:304 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:335 +#: builtin/merge.c:334 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:346 +#: builtin/merge.c:345 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:396 +#: builtin/merge.c:395 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:447 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:537 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" @@ -9962,65 +10211,60 @@ msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:867 -#, c-format -msgid "'%s' is not a commit" -msgstr "'%s' ist kein Commit" - -#: builtin/merge.c:908 +#: builtin/merge.c:890 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:910 +#: builtin/merge.c:892 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:912 +#: builtin/merge.c:894 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:917 +#: builtin/merge.c:899 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:964 +#: builtin/merge.c:946 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1038 +#: builtin/merge.c:1020 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen" -#: builtin/merge.c:1065 +#: builtin/merge.c:1047 #, c-format msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -#: builtin/merge.c:1099 +#: builtin/merge.c:1081 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1167 +#: builtin/merge.c:1146 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1171 +#: builtin/merge.c:1150 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1183 +#: builtin/merge.c:1162 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1187 +#: builtin/merge.c:1166 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist keine Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1203 +#: builtin/merge.c:1182 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10028,7 +10272,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1210 +#: builtin/merge.c:1189 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10036,117 +10280,117 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1213 +#: builtin/merge.c:1192 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1222 +#: builtin/merge.c:1201 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1230 +#: builtin/merge.c:1209 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1247 +#: builtin/merge.c:1226 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1249 +#: builtin/merge.c:1228 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1254 +#: builtin/merge.c:1233 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1256 +#: builtin/merge.c:1235 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1312 +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1315 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1318 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1321 +#: builtin/merge.c:1278 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: builtin/merge.c:1383 +#: builtin/merge.c:1340 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1392 +#: builtin/merge.c:1349 msgid "Already up-to-date." msgstr "Bereits aktuell." -#: builtin/merge.c:1402 +#: builtin/merge.c:1359 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1443 +#: builtin/merge.c:1400 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1407 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1432 msgid "Already up-to-date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1481 +#: builtin/merge.c:1438 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1504 builtin/merge.c:1583 +#: builtin/merge.c:1461 builtin/merge.c:1540 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1508 +#: builtin/merge.c:1465 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1531 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1576 +#: builtin/merge.c:1533 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1542 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1554 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10200,35 +10444,35 @@ msgstr "" "git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> " "<orig-Datei> <Datei2>" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:32 msgid "send results to standard output" msgstr "Ergebnisse zur Standard-Ausgabe senden" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:33 msgid "use a diff3 based merge" msgstr "einen diff3 basierten Merge verwenden" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:34 msgid "for conflicts, use our version" msgstr "bei Konflikten unsere Variante verwenden" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:36 msgid "for conflicts, use their version" msgstr "bei Konflikten ihre Variante verwenden" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:38 msgid "for conflicts, use a union version" msgstr "bei Konflikten eine gemeinsame Variante verwenden" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:41 msgid "for conflicts, use this marker size" msgstr "bei Konflikten diese Kennzeichnungslänge verwenden" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c:42 msgid "do not warn about conflicts" msgstr "keine Warnung bei Konflikten" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:44 msgid "set labels for file1/orig-file/file2" msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen" @@ -10374,43 +10618,47 @@ msgstr "Benenne %s nach %s um\n" msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:289 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:290 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:291 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:346 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:347 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:349 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden die <Muster> entsprechen" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:351 +msgid "ignore refs matching <pattern>" +msgstr "ignoriere Referenzen die <Muster> entsprechen" + +#: builtin/name-rev.c:353 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:354 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:355 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:324 +#: builtin/name-rev.c:361 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" @@ -10558,19 +10806,19 @@ msgstr "Konnte Notiz-Objekt nicht schreiben" msgid "the note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen." -#: builtin/notes.c:233 builtin/tag.c:460 +#: builtin/notes.c:233 builtin/tag.c:516 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:235 builtin/tag.c:463 +#: builtin/notes.c:235 builtin/tag.c:519 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." @@ -10605,12 +10853,12 @@ msgstr "" "zurückgewiesen" #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 -#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 +#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:378 builtin/notes.c:665 +#: builtin/notes.c:378 builtin/notes.c:664 #, c-format msgid "no note found for object %s." msgstr "Keine Notiz für Objekt %s gefunden." @@ -10653,7 +10901,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 +#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" @@ -10695,52 +10943,52 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:685 +#: builtin/notes.c:684 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL" -#: builtin/notes.c:687 +#: builtin/notes.c:686 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF" -#: builtin/notes.c:689 +#: builtin/notes.c:688 msgid "failed to remove 'git notes merge' worktree" msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'." -#: builtin/notes.c:709 +#: builtin/notes.c:708 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL" -#: builtin/notes.c:711 +#: builtin/notes.c:710 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden." -#: builtin/notes.c:713 +#: builtin/notes.c:712 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen." -#: builtin/notes.c:726 +#: builtin/notes.c:725 msgid "failed to resolve NOTES_MERGE_REF" msgstr "Fehler beim Auflösen von NOTES_MERGE_REF" -#: builtin/notes.c:729 +#: builtin/notes.c:728 msgid "failed to finalize notes merge" msgstr "Fehler beim Abschließen der Zusammenführung der Notizen." -#: builtin/notes.c:755 +#: builtin/notes.c:754 #, c-format msgid "unknown notes merge strategy %s" msgstr "unbekannte Merge-Strategie '%s' für Notizen" -#: builtin/notes.c:771 +#: builtin/notes.c:770 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:773 +#: builtin/notes.c:772 msgid "Merge options" msgstr "Merge-Optionen" -#: builtin/notes.c:775 +#: builtin/notes.c:774 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10748,49 +10996,49 @@ msgstr "" "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:777 +#: builtin/notes.c:776 msgid "Committing unmerged notes" msgstr "nicht zusammengeführte Notizen eintragen" -#: builtin/notes.c:779 +#: builtin/notes.c:778 msgid "finalize notes merge by committing unmerged notes" msgstr "" "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen " "committet werden" -#: builtin/notes.c:781 +#: builtin/notes.c:780 msgid "Aborting notes merge resolution" msgstr "Konfliktauflösung beim Merge von Notizen abbrechen" -#: builtin/notes.c:783 +#: builtin/notes.c:782 msgid "abort notes merge" msgstr "Merge von Notizen abbrechen" -#: builtin/notes.c:794 +#: builtin/notes.c:793 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren." -#: builtin/notes.c:799 +#: builtin/notes.c:798 msgid "must specify a notes ref to merge" msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben." -#: builtin/notes.c:823 +#: builtin/notes.c:822 #, c-format msgid "unknown -s/--strategy: %s" msgstr "Unbekannter Wert für -s/--strategy: %s" -#: builtin/notes.c:860 +#: builtin/notes.c:859 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s" -#: builtin/notes.c:863 +#: builtin/notes.c:862 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)" -#: builtin/notes.c:865 +#: builtin/notes.c:864 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10802,36 +11050,36 @@ msgstr "" "commit',\n" "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n" -#: builtin/notes.c:887 +#: builtin/notes.c:886 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:899 +#: builtin/notes.c:898 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" -#: builtin/notes.c:902 +#: builtin/notes.c:901 msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/notes.c:941 +#: builtin/notes.c:940 msgid "report pruned notes" msgstr "gelöschte Notizen melden" -#: builtin/notes.c:983 +#: builtin/notes.c:982 msgid "notes-ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:984 +#: builtin/notes.c:983 msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1019 +#: builtin/notes.c:1018 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -10855,183 +11103,183 @@ msgstr "" msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:770 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" "aufgetrennt." -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:783 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1068 +#: builtin/pack-objects.c:1063 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-" "Datei\n" "geschrieben wurden." -#: builtin/pack-objects.c:2344 +#: builtin/pack-objects.c:2426 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2747 +#: builtin/pack-objects.c:2829 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2833 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2863 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2865 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2785 +#: builtin/pack-objects.c:2867 msgid "show progress meter during object writing phase" msgstr "" "Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2788 +#: builtin/pack-objects.c:2870 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2789 +#: builtin/pack-objects.c:2871 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2790 +#: builtin/pack-objects.c:2872 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2875 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2877 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2879 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2799 +#: builtin/pack-objects.c:2881 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2883 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2803 +#: builtin/pack-objects.c:2885 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2887 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2889 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2891 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2893 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2895 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2897 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2899 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:2820 +#: builtin/pack-objects.c:2902 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2905 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2826 +#: builtin/pack-objects.c:2908 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2911 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2831 +#: builtin/pack-objects.c:2913 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2915 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2917 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:2837 +#: builtin/pack-objects.c:2919 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2840 +#: builtin/pack-objects.c:2922 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2842 +#: builtin/pack-objects.c:2924 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2844 +#: builtin/pack-objects.c:2926 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2928 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2848 +#: builtin/pack-objects.c:2930 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2850 +#: builtin/pack-objects.c:2932 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2934 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3061 msgid "Counting objects" msgstr "Zähle Objekte" @@ -11088,7 +11336,7 @@ msgstr "Optionen bezogen auf Merge" msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:148 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 msgid "allow fast-forward" msgstr "Vorspulen erlauben" @@ -11167,7 +11415,7 @@ msgstr "Siehe git-pull(1) für weitere Details." msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" @@ -11475,11 +11723,11 @@ msgstr "Die Optionen --all und --mirror sind inkompatibel." msgid "repository" msgstr "Repository" -#: builtin/push.c:519 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:162 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:520 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:164 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" @@ -11491,15 +11739,15 @@ msgstr "Referenzen löschen" msgid "push tags (can't be used with --all or --mirror)" msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:526 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:165 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:528 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:179 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:529 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" @@ -11507,12 +11755,12 @@ msgstr "Referenz muss sich auf dem angegebenen Wert befinden" msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:534 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:173 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 -#: builtin/send-pack.c:159 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 +#: builtin/send-pack.c:160 msgid "receive pack program" msgstr "'receive pack' Programm" @@ -11532,19 +11780,19 @@ msgstr "\"pre-push hook\" umgehen" msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:546 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:167 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:548 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:174 msgid "request atomic transaction on remote side" msgstr "Referenzen atomar versenden" -#: builtin/push.c:549 +#: builtin/push.c:549 builtin/send-pack.c:170 msgid "server-specific" msgstr "serverspezifisch" -#: builtin/push.c:549 +#: builtin/push.c:549 builtin/send-pack.c:171 msgid "option to transmit" msgstr "Option übertragen" @@ -11560,7 +11808,7 @@ msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." msgid "push options must not have new line characters" msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben" -#: builtin/read-tree.c:37 +#: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -11571,75 +11819,87 @@ msgstr "" "index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> " "[<Commit-Referenz3>]])" -#: builtin/read-tree.c:110 +#: builtin/read-tree.c:130 msgid "write resulting index to <file>" msgstr "resultierenden Index nach <Datei> schreiben" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:133 msgid "only empty the index" msgstr "nur den Index leeren" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:135 msgid "Merging" msgstr "Merge" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:137 msgid "perform a merge in addition to a read" msgstr "einen Merge, zusätzlich zum Lesen, ausführen" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:139 msgid "3-way merge if no file level merging required" msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:141 msgid "3-way merge in presence of adds and removes" msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:143 msgid "same as -m, but discard unmerged entries" msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:144 msgid "<subdirectory>/" msgstr "<Unterverzeichnis>/" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:145 msgid "read the tree into the index under <subdirectory>/" msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:148 msgid "update working tree with merge result" msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:150 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:151 msgid "allow explicitly ignored files to be overwritten" msgstr "explizit ignorierte Dateien zu überschreiben erlauben" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:154 msgid "don't check the working tree after merging" msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:155 msgid "don't update the index or the work tree" msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:157 msgid "skip applying sparse checkout filter" msgstr "Anwendung des Filters für partielles Auschecken überspringen" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:159 msgid "debug unpack-trees" msgstr "unpack-trees protokollieren" -#: builtin/receive-pack.c:26 +#: builtin/rebase--helper.c:7 +msgid "git rebase--helper [<options>]" +msgstr "git rebase--helper [<Optionen>]" + +#: builtin/rebase--helper.c:19 +msgid "continue rebase" +msgstr "Rebase fortsetzen" + +#: builtin/rebase--helper.c:21 +msgid "abort rebase" +msgstr "Rebase abbrechen" + +#: builtin/receive-pack.c:27 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:793 +#: builtin/receive-pack.c:795 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" @@ -11671,7 +11931,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:813 +#: builtin/receive-pack.c:815 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" @@ -11692,11 +11952,11 @@ msgstr "" "\n" "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'." -#: builtin/receive-pack.c:1883 +#: builtin/receive-pack.c:1888 msgid "quiet" msgstr "weniger Ausgaben" -#: builtin/receive-pack.c:1897 +#: builtin/receive-pack.c:1902 msgid "You must specify a directory." msgstr "Sie müssen ein Repository angeben." @@ -11880,7 +12140,7 @@ msgstr "(übereinstimmend)" msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" @@ -11911,7 +12171,7 @@ msgstr "Konnte '%s' nicht löschen" msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:792 +#: builtin/remote.c:794 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11927,137 +12187,137 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:806 +#: builtin/remote.c:808 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:907 +#: builtin/remote.c:909 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:910 +#: builtin/remote.c:912 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:912 +#: builtin/remote.c:914 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:914 +#: builtin/remote.c:916 msgid " ???" msgstr " ???" -#: builtin/remote.c:955 +#: builtin/remote.c:957 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:963 +#: builtin/remote.c:965 #, c-format msgid "rebases interactively onto remote %s" msgstr "interaktiver Rebase auf Remote-Branch %s" -#: builtin/remote.c:964 +#: builtin/remote.c:966 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:967 +#: builtin/remote.c:969 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:970 +#: builtin/remote.c:972 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:973 +#: builtin/remote.c:975 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s und mit Remote-Branch %s\n" -#: builtin/remote.c:1016 +#: builtin/remote.c:1018 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1019 +#: builtin/remote.c:1021 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1023 +#: builtin/remote.c:1025 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1026 +#: builtin/remote.c:1028 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1029 +#: builtin/remote.c:1031 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1036 +#: builtin/remote.c:1038 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1039 +#: builtin/remote.c:1041 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1045 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1046 +#: builtin/remote.c:1048 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1114 +#: builtin/remote.c:1116 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1141 +#: builtin/remote.c:1143 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1142 +#: builtin/remote.c:1144 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 +#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 msgid "(no URL)" msgstr "(keine URL)" #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1154 builtin/remote.c:1156 +#: builtin/remote.c:1156 builtin/remote.c:1158 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1160 msgid "(not queried)" msgstr "(nicht abgefragt)" -#: builtin/remote.c:1160 +#: builtin/remote.c:1162 msgid "(unknown)" msgstr "(unbekannt)" -#: builtin/remote.c:1164 +#: builtin/remote.c:1166 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -12065,163 +12325,163 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1176 +#: builtin/remote.c:1178 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1179 builtin/remote.c:1205 +#: builtin/remote.c:1181 builtin/remote.c:1207 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1188 +#: builtin/remote.c:1190 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1196 +#: builtin/remote.c:1198 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1202 +#: builtin/remote.c:1204 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1223 +#: builtin/remote.c:1225 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1225 +#: builtin/remote.c:1227 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1240 +#: builtin/remote.c:1242 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1242 +#: builtin/remote.c:1244 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1252 +#: builtin/remote.c:1254 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1260 +#: builtin/remote.c:1262 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1264 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1280 +#: builtin/remote.c:1282 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1283 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1291 +#: builtin/remote.c:1293 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1292 +#: builtin/remote.c:1294 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1308 +#: builtin/remote.c:1310 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1313 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1358 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 +#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1435 +#: builtin/remote.c:1437 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1442 +#: builtin/remote.c:1444 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1459 +#: builtin/remote.c:1461 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs für Push ausgeben" -#: builtin/remote.c:1461 +#: builtin/remote.c:1463 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1489 +#: builtin/remote.c:1491 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1515 +#: builtin/remote.c:1517 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1517 +#: builtin/remote.c:1519 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1526 +#: builtin/remote.c:1528 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1567 +#: builtin/remote.c:1569 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1575 +#: builtin/remote.c:1577 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1579 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1591 +#: builtin/remote.c:1593 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" -#: builtin/remote.c:1622 +#: builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -12343,22 +12603,22 @@ msgstr "git replace -d <Objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "Ungültiger Objekt-Name: '%s'" -#: builtin/replace.c:355 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungültiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:357 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:368 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12367,45 +12627,45 @@ msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:401 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:402 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:408 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" -#: builtin/replace.c:432 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:433 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "ersetzende Referenzen löschen" -#: builtin/replace.c:434 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:435 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "Eltern-Commits eines Commits ändern" -#: builtin/replace.c:436 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:437 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" -#: builtin/replace.c:438 +#: builtin/replace.c:443 msgid "use this format" msgstr "das angegebene Format benutzen" @@ -12549,24 +12809,24 @@ msgstr "Konnte neue Index-Datei nicht schreiben." msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:393 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:398 msgid "keep the `--` passed as an arg" msgstr "`--` als Argument lassen" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:400 msgid "stop parsing after the first non-option argument" msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:403 msgid "output in stuck long form" msgstr "" "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')" -#: builtin/rev-parse.c:532 +#: builtin/rev-parse.c:534 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12597,68 +12857,72 @@ msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <Unterbefehl>" -#: builtin/revert.c:71 +#: builtin/revert.c:89 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kann nicht mit %s verwendet werden" -#: builtin/revert.c:80 +#: builtin/revert.c:98 msgid "end revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden" -#: builtin/revert.c:81 +#: builtin/revert.c:99 msgid "resume revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen" -#: builtin/revert.c:82 +#: builtin/revert.c:100 msgid "cancel revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen" -#: builtin/revert.c:83 +#: builtin/revert.c:101 msgid "don't automatically commit" msgstr "nicht automatisch committen" -#: builtin/revert.c:84 +#: builtin/revert.c:102 msgid "edit the commit message" msgstr "Commit-Beschreibung bearbeiten" -#: builtin/revert.c:87 -msgid "parent number" +#: builtin/revert.c:105 +msgid "parent-number" msgstr "Nummer des Elternteils" -#: builtin/revert.c:89 +#: builtin/revert.c:106 +msgid "select mainline parent" +msgstr "Elternteil der Hauptlinie auswählen" + +#: builtin/revert.c:108 msgid "merge strategy" msgstr "Merge-Strategie" -#: builtin/revert.c:90 +#: builtin/revert.c:109 msgid "option" msgstr "Option" -#: builtin/revert.c:91 +#: builtin/revert.c:110 msgid "option for merge strategy" msgstr "Option für Merge-Strategie" -#: builtin/revert.c:100 +#: builtin/revert.c:119 msgid "append commit name" msgstr "Commit-Namen anhängen" -#: builtin/revert.c:102 +#: builtin/revert.c:121 msgid "preserve initially empty commits" msgstr "ursprüngliche, leere Commits erhalten" -#: builtin/revert.c:103 +#: builtin/revert.c:122 msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" -#: builtin/revert.c:104 +#: builtin/revert.c:123 msgid "keep redundant, empty commits" msgstr "redundante, leere Commits behalten" -#: builtin/revert.c:192 +#: builtin/revert.c:211 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:205 +#: builtin/revert.c:224 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" @@ -12758,19 +13022,19 @@ msgstr "" " --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig " "aus." -#: builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "remote name" msgstr "Name des Remote-Repositories" -#: builtin/send-pack.c:171 +#: builtin/send-pack.c:175 msgid "use stateless RPC protocol" msgstr "zustandsloses RPC-Protokoll verwenden" -#: builtin/send-pack.c:172 +#: builtin/send-pack.c:176 msgid "read refs from stdin" msgstr "Referenzen von der Standard-Eingabe lesen" -#: builtin/send-pack.c:173 +#: builtin/send-pack.c:177 msgid "print status from remote helper" msgstr "Status des Remote-Helpers ausgeben" @@ -12778,27 +13042,27 @@ msgstr "Status des Remote-Helpers ausgeben" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:248 msgid "Group by committer rather than author" msgstr "über Commit-Ersteller anstatt Autor gruppieren" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:250 msgid "sort output according to the number of commits per author" msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:252 msgid "Suppress commit descriptions, only provides commit count" msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:254 msgid "Show the email address of each author" msgstr "die E-Mail-Adresse von jedem Autor anzeigen" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:255 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:256 msgid "Linewrap output" msgstr "Ausgabe mit Zeilenumbrüchen" @@ -12818,123 +13082,123 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" -#: builtin/show-branch.c:375 +#: builtin/show-branch.c:374 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln" msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln" -#: builtin/show-branch.c:541 +#: builtin/show-branch.c:536 #, c-format msgid "no matching refs with %s" msgstr "keine übereinstimmenden Referenzen mit %s" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:632 msgid "show remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches anzeigen" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:634 msgid "show remote-tracking branches" msgstr "Remote-Tracking-Branches anzeigen" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:636 msgid "color '*!+-' corresponding to the branch" msgstr "'*!+-' entsprechend des Branches einfärben" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:638 msgid "show <n> more commits after the common ancestor" msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:640 msgid "synonym to more=-1" msgstr "Synonym für more=-1" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:641 msgid "suppress naming strings" msgstr "Namen unterdrücken" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:643 msgid "include the current branch" msgstr "den aktuellen Branch einbeziehen" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:645 msgid "name commits with their object names" msgstr "Commits nach ihren Objektnamen benennen" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:647 msgid "show possible merge bases" msgstr "mögliche Merge-Basen anzeigen" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:649 msgid "show refs unreachable from any other ref" msgstr "" "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:651 msgid "show commits in topological order" msgstr "Commits in topologischer Ordnung anzeigen" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:654 msgid "show only commits not on the first branch" msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:656 msgid "show merges reachable from only one tip" msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:658 msgid "topologically sort, maintaining date order where possible" msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:661 msgid "<n>[,<base>]" msgstr "<n>[,<Basis>]" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:662 msgid "show <n> most recent ref-log entries starting at base" msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" -#: builtin/show-branch.c:703 +#: builtin/show-branch.c:696 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-" "base" -#: builtin/show-branch.c:727 +#: builtin/show-branch.c:720 msgid "no branches given, and HEAD is not valid" msgstr "keine Branches angegeben, und HEAD ist ungültig" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:723 msgid "--reflog option needs one branch name" msgstr "Die Option --reflog benötigt einen Branchnamen." -#: builtin/show-branch.c:733 +#: builtin/show-branch.c:726 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden" msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden" -#: builtin/show-branch.c:737 +#: builtin/show-branch.c:730 #, c-format msgid "no such ref %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/show-branch.c:829 +#: builtin/show-branch.c:814 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "Kann nicht mehr als %d Commit behandeln." msgstr[1] "Kann nicht mehr als %d Commits behandeln." -#: builtin/show-branch.c:833 +#: builtin/show-branch.c:818 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' ist keine gültige Referenz." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:821 #, c-format msgid "cannot find commit %s (%s)" msgstr "kann Commit %s (%s) nicht finden" @@ -13005,12 +13269,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" @@ -13020,95 +13284,105 @@ msgstr "Vollständiger Referenzname erwartet, %s erhalten" msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker für relative Pfade" -#: builtin/submodule--helper.c:287 +#: builtin/submodule--helper.c:310 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:395 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses " +"Repository\n" +"sein eigenes verbindliches Upstream-Repository ist." + +#: builtin/submodule--helper.c:406 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration." -#: builtin/submodule--helper.c:377 +#: builtin/submodule--helper.c:410 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:420 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n" -#: builtin/submodule--helper.c:394 +#: builtin/submodule--helper.c:427 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n" "Konfiguration." -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:443 msgid "Suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:448 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<Pfad>]" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:476 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:482 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden" -#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" -#: builtin/submodule--helper.c:564 +#: builtin/submodule--helper.c:604 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt" -#: builtin/submodule--helper.c:571 +#: builtin/submodule--helper.c:611 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt." -#: builtin/submodule--helper.c:595 +#: builtin/submodule--helper.c:633 msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" -#: builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:636 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:601 +#: builtin/submodule--helper.c:639 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:607 +#: builtin/submodule--helper.c:645 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 +#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:653 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13117,98 +13391,88 @@ msgstr "" "<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth " "<Tiefe>] --url <URL> --path <Pfad>" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:684 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" -#: builtin/submodule--helper.c:662 -#, c-format -msgid "cannot open file '%s'" -msgstr "Kann Datei '%s' nicht öffnen" - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "could not close file %s" -msgstr "Konnte Datei '%s' nicht schließen." - -#: builtin/submodule--helper.c:674 +#: builtin/submodule--helper.c:699 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:764 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Submodul-Pfad '%s' nicht initialisiert" -#: builtin/submodule--helper.c:746 +#: builtin/submodule--helper.c:768 msgid "Maybe you want to use 'update --init'?" msgstr "Meinten Sie vielleicht 'update --init'?" -#: builtin/submodule--helper.c:772 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Überspringe nicht zusammengeführtes Submodul %s" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:814 #, c-format msgid "Skipping submodule '%s'" msgstr "Überspringe Submodul '%s'" -#: builtin/submodule--helper.c:929 +#: builtin/submodule--helper.c:942 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" -#: builtin/submodule--helper.c:940 +#: builtin/submodule--helper.c:953 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 +#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:977 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:981 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:972 +#: builtin/submodule--helper.c:985 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" "Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten " "bei\n" "der angegebenen Anzahl von Commits." -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:988 msgid "parallel jobs" msgstr "Parallele Ausführungen" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:990 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" "ob das initiale Klonen den Empfehlungen für eine unvollständige\n" "Historie (shallow) folgen soll" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:991 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:998 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:995 +#: builtin/submodule--helper.c:1008 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert für --update Parameter" -#: builtin/submodule--helper.c:1066 +#: builtin/submodule--helper.c:1079 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13217,24 +13481,24 @@ msgstr "" "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n" "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch." -#: builtin/submodule--helper.c:1106 +#: builtin/submodule--helper.c:1163 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1169 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<Pfad>...]" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1226 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden" -#: builtin/submodule--helper.c:1164 +#: builtin/submodule--helper.c:1233 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:1170 +#: builtin/submodule--helper.c:1239 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" @@ -13282,32 +13546,29 @@ msgstr "git tag -d <Tagname>..." #: builtin/tag.c:25 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>]\n" +"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--" +"points-at <Objekt>]\n" "\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]" #: builtin/tag.c:27 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<Format>] <Tagname>..." -#: builtin/tag.c:82 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "Tagname zu lang: %.*s..." - -#: builtin/tag.c:87 +#: builtin/tag.c:83 #, c-format msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:102 +#: builtin/tag.c:99 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:128 #, c-format msgid "" "\n" @@ -13320,7 +13581,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:132 #, c-format msgid "" "\n" @@ -13335,138 +13596,142 @@ msgstr "" "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" "selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:213 +#: builtin/tag.c:210 msgid "unable to sign the tag" msgstr "konnte Tag nicht signieren" -#: builtin/tag.c:215 +#: builtin/tag.c:212 msgid "unable to write tag file" msgstr "konnte Tag-Datei nicht schreiben" -#: builtin/tag.c:240 +#: builtin/tag.c:236 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:253 -msgid "tag header too big." -msgstr "Tag-Kopf zu groß." - -#: builtin/tag.c:289 +#: builtin/tag.c:282 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:295 +#: builtin/tag.c:289 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde gelassen in %s\n" -#: builtin/tag.c:354 +#: builtin/tag.c:397 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:356 +#: builtin/tag.c:399 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:358 +#: builtin/tag.c:401 msgid "delete tags" msgstr "Tags löschen" -#: builtin/tag.c:359 +#: builtin/tag.c:402 msgid "verify tags" msgstr "Tags überprüfen" -#: builtin/tag.c:361 +#: builtin/tag.c:404 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:363 +#: builtin/tag.c:406 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:365 +#: builtin/tag.c:408 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:367 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:371 +#: builtin/tag.c:414 msgid "use another key to sign the tag" msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:372 +#: builtin/tag.c:415 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:373 builtin/update-ref.c:368 +#: builtin/tag.c:416 builtin/update-ref.c:368 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:375 +#: builtin/tag.c:418 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:376 +#: builtin/tag.c:419 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:377 builtin/tag.c:378 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:379 +#: builtin/tag.c:421 builtin/tag.c:423 +msgid "print only tags that don't contain the commit" +msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" + +#: builtin/tag.c:424 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:380 +#: builtin/tag.c:425 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:385 +#: builtin/tag.c:430 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:415 +#: builtin/tag.c:469 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:437 -msgid "-n option is only allowed with -l." -msgstr "-n Option ist nur erlaubt mit -l." +#: builtin/tag.c:491 +msgid "-n option is only allowed in list mode" +msgstr "Die Option -n ist nur im Listenmodus erlaubt." + +#: builtin/tag.c:493 +msgid "--contains option is only allowed in list mode" +msgstr "Die Option --contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:439 -msgid "--contains option is only allowed with -l." -msgstr "--contains Option ist nur erlaubt mit -l." +#: builtin/tag.c:495 +msgid "--no-contains option is only allowed in list mode" +msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:441 -msgid "--points-at option is only allowed with -l." -msgstr "--points-at Option ist nur erlaubt mit -l." +#: builtin/tag.c:497 +msgid "--points-at option is only allowed in list mode" +msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." -#: builtin/tag.c:443 -msgid "--merged and --no-merged option are only allowed with -l" -msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt." +#: builtin/tag.c:499 +msgid "--merged and --no-merged options are only allowed in list mode" +msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt." -#: builtin/tag.c:454 +#: builtin/tag.c:510 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:473 +#: builtin/tag.c:529 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:479 +#: builtin/tag.c:535 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:484 +#: builtin/tag.c:540 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:512 +#: builtin/tag.c:570 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -13495,184 +13760,200 @@ msgstr "Konnte Datei '%s' nicht erstellen" msgid "failed to delete file %s" msgstr "Konnte Datei '%s' nicht löschen" -#: builtin/update-index.c:110 builtin/update-index.c:212 +#: builtin/update-index.c:110 builtin/update-index.c:216 #, c-format msgid "failed to delete directory %s" msgstr "Konnte Verzeichnis '%s' nicht löschen" -#: builtin/update-index.c:133 +#: builtin/update-index.c:135 #, c-format msgid "Testing mtime in '%s' " msgstr "Prüfe mtime in '%s' " -#: builtin/update-index.c:145 +#: builtin/update-index.c:149 msgid "directory stat info does not change after adding a new file" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht " "geändert" -#: builtin/update-index.c:158 +#: builtin/update-index.c:162 msgid "directory stat info does not change after adding a new directory" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen " "Verzeichnisses nicht geändert" -#: builtin/update-index.c:171 +#: builtin/update-index.c:175 msgid "directory stat info changes after updating a file" msgstr "" "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert" -#: builtin/update-index.c:182 +#: builtin/update-index.c:186 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein " "Unterverzeichnis geändert" -#: builtin/update-index.c:193 +#: builtin/update-index.c:197 msgid "directory stat info does not change after deleting a file" msgstr "" "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht " "geändert" -#: builtin/update-index.c:206 +#: builtin/update-index.c:210 msgid "directory stat info does not change after deleting a directory" msgstr "" "Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses " "nicht geändert" -#: builtin/update-index.c:213 +#: builtin/update-index.c:217 msgid " OK" msgstr " OK" -#: builtin/update-index.c:564 +#: builtin/update-index.c:568 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:919 +#: builtin/update-index.c:923 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:922 +#: builtin/update-index.c:926 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:925 +#: builtin/update-index.c:929 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:927 +#: builtin/update-index.c:931 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:929 +#: builtin/update-index.c:933 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:931 +#: builtin/update-index.c:935 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:934 +#: builtin/update-index.c:938 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:938 +#: builtin/update-index.c:942 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:942 +#: builtin/update-index.c:946 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:943 +#: builtin/update-index.c:947 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:952 +#: builtin/update-index.c:956 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:955 +#: builtin/update-index.c:959 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:958 +#: builtin/update-index.c:962 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:961 +#: builtin/update-index.c:965 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:964 +#: builtin/update-index.c:968 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:966 +#: builtin/update-index.c:970 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:968 +#: builtin/update-index.c:972 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:970 +#: builtin/update-index.c:974 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:974 +#: builtin/update-index.c:978 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:978 +#: builtin/update-index.c:982 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:982 +#: builtin/update-index.c:986 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:986 +#: builtin/update-index.c:990 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:989 +#: builtin/update-index.c:993 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:991 +#: builtin/update-index.c:995 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:995 +#: builtin/update-index.c:999 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1001 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1003 msgid "enable/disable untracked cache" msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1005 msgid "test if the filesystem supports untracked cache" msgstr "" "prüfen ob das Dateisystem einen Cache für unversionierte Dateien unterstützt" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1007 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" -#: builtin/update-index.c:1120 +#: builtin/update-index.c:1107 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n" +"wenn sie wirklich das Splitting des Index aktivieren möchten." + +#: builtin/update-index.c:1116 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" +"wenn Sie wirklich das Splitting des Index deaktivieren möchten." + +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13680,11 +13961,11 @@ msgstr "" "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten." -#: builtin/update-index.c:1124 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Cache für unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13693,7 +13974,7 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache für unversionierte Dateien für '%s' aktiviert" @@ -13787,27 +14068,27 @@ msgstr "git worktree prune [<Optionen>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:43 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" -#: builtin/worktree.c:48 +#: builtin/worktree.c:49 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:53 +#: builtin/worktree.c:54 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" -#: builtin/worktree.c:80 +#: builtin/worktree.c:81 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" @@ -13825,62 +14106,66 @@ msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen" msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:236 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:272 +#: builtin/worktree.c:274 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Bereite %s vor (Identifikation %s)" -#: builtin/worktree.c:323 +#: builtin/worktree.c:328 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:325 +#: builtin/worktree.c:330 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:327 +#: builtin/worktree.c:332 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:329 +#: builtin/worktree.c:334 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:337 +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" +msgstr "das neue Arbeitsverzeichnis gesperrt lassen" + +#: builtin/worktree.c:343 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:472 +#: builtin/worktree.c:478 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:490 builtin/worktree.c:523 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:486 builtin/worktree.c:519 +#: builtin/worktree.c:492 builtin/worktree.c:525 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:491 +#: builtin/worktree.c:497 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:493 +#: builtin/worktree.c:499 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:521 +#: builtin/worktree.c:527 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" @@ -13905,21 +14190,21 @@ msgstr "nur nützlich für Fehlersuche" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<Optionen>] <Verzeichnis>" -#: upload-pack.c:1036 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "nach einem einzigen Request/Response-Austausch beenden" -#: upload-pack.c:1038 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "direkt nach der initialen Angabe der Commits beenden" -#: upload-pack.c:1040 +#: upload-pack.c:1044 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis " "ist" -#: upload-pack.c:1042 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen" @@ -13954,17 +14239,22 @@ msgstr "" "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: http.c:344 +#: http.c:336 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d" + +#: http.c:357 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt" -#: http.c:353 +#: http.c:366 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n" "nicht unterstützt." -#: http.c:1713 +#: http.c:1766 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13975,7 +14265,7 @@ msgstr "" " gefragt nach: %s\n" " umgeleitet: %s" -#: remote-curl.c:319 +#: remote-curl.c:323 #, c-format msgid "redirecting to %s" msgstr "Leite nach %s um" @@ -14364,7 +14654,7 @@ msgstr "Versuche einfachen Merge mit $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge." -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -14378,39 +14668,39 @@ msgstr "" "Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n" "führen Sie \"git rebase --abort\" aus." -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" -#: git-rebase.sh:171 +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: git-rebase.sh:216 +#: git-rebase.sh:217 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: git-rebase.sh:357 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: git-rebase.sh:368 +#: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet " "werden." -#: git-rebase.sh:375 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14418,7 +14708,7 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14439,104 +14729,104 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist." -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ungültiger Upstream-Branch $upstream_name" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: es gibt mehr als eine Merge-Basis" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Merge-Basis" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "$onto_name zeigt auf keinen gültigen Commit" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: Branch $branch_name nicht gefunden" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen." -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Automatischen Stash erzeugt: $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand." -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen." -#: git-rebase.sh:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Änderungen von $mb zu $onto:" -#: git-rebase.sh:614 +#: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n" "darauf neu anzuwenden ..." -#: git-rebase.sh:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." -#: git-stash.sh:50 +#: git-stash.sh:53 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear mit Parametern ist nicht implementiert" -#: git-stash.sh:73 +#: git-stash.sh:94 msgid "You do not have the initial commit yet" msgstr "Sie haben bisher noch keinen initialen Commit" -#: git-stash.sh:88 +#: git-stash.sh:109 msgid "Cannot save the current index state" msgstr "Kann den aktuellen Zustand des Index nicht speichern" -#: git-stash.sh:103 +#: git-stash.sh:124 msgid "Cannot save the untracked files" msgstr "Kann die unversionierten Dateien nicht speichern" -#: git-stash.sh:123 git-stash.sh:136 +#: git-stash.sh:144 git-stash.sh:157 msgid "Cannot save the current worktree state" msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" -#: git-stash.sh:140 +#: git-stash.sh:161 msgid "No changes selected" msgstr "Keine Änderungen ausgewählt" -#: git-stash.sh:143 +#: git-stash.sh:164 msgid "Cannot remove temporary index (can't happen)" msgstr "Kann temporären Index nicht löschen (kann nicht passieren)" -#: git-stash.sh:156 +#: git-stash.sh:177 msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" -#: git-stash.sh:188 +#: git-stash.sh:209 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." @@ -14551,7 +14841,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:265 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14561,108 +14851,108 @@ msgstr "" " Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- " "'$option'\"" -#: git-stash.sh:251 +#: git-stash.sh:278 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden" -#: git-stash.sh:259 +#: git-stash.sh:286 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Speichern" -#: git-stash.sh:263 +#: git-stash.sh:291 msgid "Cannot initialize stash" msgstr "Kann \"stash\" nicht initialisieren" -#: git-stash.sh:267 +#: git-stash.sh:295 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: git-stash.sh:268 +#: git-stash.sh:296 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg" -#: git-stash.sh:285 +#: git-stash.sh:323 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" -#: git-stash.sh:403 +#: git-stash.sh:471 #, sh-format msgid "unknown option: $opt" msgstr "unbekannte Option: $opt" -#: git-stash.sh:416 +#: git-stash.sh:484 msgid "No stash found." msgstr "Kein Stash-Eintrag gefunden." -#: git-stash.sh:423 +#: git-stash.sh:491 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zu viele Commits angegeben: $REV" -#: git-stash.sh:438 +#: git-stash.sh:506 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" -#: git-stash.sh:466 +#: git-stash.sh:534 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ist kein \"stash\"-artiger Commit" -#: git-stash.sh:477 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ist keine \"stash\"-Referenz" -#: git-stash.sh:485 +#: git-stash.sh:553 msgid "unable to refresh index" msgstr "Konnte den Index nicht aktualisieren." -#: git-stash.sh:489 +#: git-stash.sh:557 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist" -#: git-stash.sh:497 +#: git-stash.sh:565 msgid "Conflicts in index. Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: git-stash.sh:499 +#: git-stash.sh:567 msgid "Could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: git-stash.sh:508 +#: git-stash.sh:576 msgid "Could not restore untracked files from stash" msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen" -#: git-stash.sh:533 +#: git-stash.sh:601 msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus dem Index entfernen" -#: git-stash.sh:548 +#: git-stash.sh:616 msgid "Index was not unstashed." msgstr "Index wurde nicht aus dem Stash zurückgeladen." -#: git-stash.sh:562 +#: git-stash.sh:630 msgid "The stash is kept in case you need it again." msgstr "Der Stash wird behalten, im Falle Sie benötigen diesen nochmal." -#: git-stash.sh:571 +#: git-stash.sh:639 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Gelöscht ${REV} ($s)" -#: git-stash.sh:572 +#: git-stash.sh:640 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:580 +#: git-stash.sh:648 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: git-stash.sh:652 +#: git-stash.sh:727 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" @@ -14753,29 +15043,29 @@ msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:327 +#: git-submodule.sh:341 #, sh-format msgid "Entering '$displaypath'" msgstr "Betrete '$displaypath'" -#: git-submodule.sh:347 +#: git-submodule.sh:361 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:418 +#: git-submodule.sh:432 #, sh-format msgid "pathspec and --all are incompatible" msgstr "Pfadspezifikationen und --all sind inkompatibel." -#: git-submodule.sh:423 +#: git-submodule.sh:437 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" "möchten." -#: git-submodule.sh:443 +#: git-submodule.sh:457 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14787,7 +15077,7 @@ msgstr "" "löschen\n" "möchten)" -#: git-submodule.sh:451 +#: git-submodule.sh:465 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -14796,41 +15086,41 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; " "verwenden Sie '-f', um diese zu verwerfen" -#: git-submodule.sh:454 +#: git-submodule.sh:468 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Verzeichnis '$displaypath' bereinigt." -#: git-submodule.sh:455 +#: git-submodule.sh:469 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen." -#: git-submodule.sh:458 +#: git-submodule.sh:472 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen." -#: git-submodule.sh:467 +#: git-submodule.sh:481 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration " "entfernt." -#: git-submodule.sh:623 +#: git-submodule.sh:637 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:633 +#: git-submodule.sh:647 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:638 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14839,12 +15129,12 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:656 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" -#: git-submodule.sh:662 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14853,85 +15143,85 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:669 +#: git-submodule.sh:683 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:670 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:674 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:675 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:680 +#: git-submodule.sh:694 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:681 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:686 +#: git-submodule.sh:700 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' " "fehlgeschlagen" -#: git-submodule.sh:687 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:718 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:826 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." -#: git-submodule.sh:878 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:898 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:901 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:904 +#: git-submodule.sh:918 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst" -#: git-submodule.sh:1051 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" -#: git-submodule.sh:1118 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" @@ -15241,11 +15531,11 @@ msgstr "" msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen." -#: git-rebase--interactive.sh:1079 +#: git-rebase--interactive.sh:1083 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen" -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:1088 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15277,13 +15567,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1101 +#: git-rebase--interactive.sh:1105 msgid "Error trying to find the author identity to amend commit" msgstr "" "Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n" "finden" -#: git-rebase--interactive.sh:1106 +#: git-rebase--interactive.sh:1110 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15293,11 +15583,11 @@ msgstr "" "erneut\n" "aus." -#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 +#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 msgid "Could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: git-rebase--interactive.sh:1139 +#: git-rebase--interactive.sh:1147 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15311,40 +15601,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 +#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 msgid "Could not execute editor" msgstr "Konnte Editor nicht ausführen." -#: git-rebase--interactive.sh:1160 +#: git-rebase--interactive.sh:1168 #, sh-format msgid "Could not checkout $switch_to" msgstr "Konnte $switch_to nicht auschecken." -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:1173 msgid "No HEAD?" msgstr "Kein HEAD?" -#: git-rebase--interactive.sh:1166 +#: git-rebase--interactive.sh:1174 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen." -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:1176 msgid "Could not mark as interactive" msgstr "Konnte nicht als interaktiven Rebase markieren." -#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 +#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 msgid "Could not init rewritten commits" msgstr "Konnte neu geschriebene Commits nicht initialisieren." -#: git-rebase--interactive.sh:1283 +#: git-rebase--interactive.sh:1291 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)" msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1296 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15354,7 +15644,7 @@ msgstr "" "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" "\n" -#: git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1303 msgid "Note that empty commits are commented out" msgstr "Leere Commits sind auskommentiert." @@ -15449,127 +15739,125 @@ msgstr "zur Staging-Area hinzugefügt" msgid "unstaged" msgstr "aus Staging-Area entfernt" -#: git-add--interactive.perl:297 git-add--interactive.perl:322 +#: git-add--interactive.perl:288 git-add--interactive.perl:313 msgid "binary" msgstr "Binär" -#: git-add--interactive.perl:306 git-add--interactive.perl:360 +#: git-add--interactive.perl:297 git-add--interactive.perl:351 msgid "nothing" msgstr "Nichts" -#: git-add--interactive.perl:342 git-add--interactive.perl:357 +#: git-add--interactive.perl:333 git-add--interactive.perl:348 msgid "unchanged" msgstr "unverändert" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:644 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d Pfad hinzugefügt\n" msgstr[1] "%d Pfade hinzugefügt\n" -#: git-add--interactive.perl:656 +#: git-add--interactive.perl:647 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d Pfad aktualisiert\n" msgstr[1] "%d Pfade aktualisiert\n" -#: git-add--interactive.perl:659 +#: git-add--interactive.perl:650 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d Pfad wiederhergestellt\n" msgstr[1] "%d Pfade wiederhergestellt\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:653 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d Pfad angefasst\n" msgstr[1] "%d Pfade angefasst\n" -#: git-add--interactive.perl:671 +#: git-add--interactive.perl:662 msgid "Update" msgstr "Aktualisieren" -#: git-add--interactive.perl:683 +#: git-add--interactive.perl:674 msgid "Revert" msgstr "Revert" -#: git-add--interactive.perl:706 +#: git-add--interactive.perl:697 #, perl-format msgid "note: %s is untracked now.\n" msgstr "Hinweis: %s ist nun unversioniert.\n" -#: git-add--interactive.perl:717 +#: git-add--interactive.perl:708 msgid "Add untracked" msgstr "unversionierte Dateien hinzufügen" -#: git-add--interactive.perl:723 +#: git-add--interactive.perl:714 msgid "No untracked files.\n" msgstr "Keine unversionierten Dateien.\n" -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1030 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n" +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" "direkt als zum Hinzufügen zur Staging-Area markiert." -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n" +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" "direkt als zum Hinzufügen zum Stash markiert." -#: git-add--interactive.perl:1045 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n" +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" "direkt als zum Entfernen aus der Staging-Area markiert." -#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n" +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" "direkt als zum Anwenden markiert." -#: git-add--interactive.perl:1051 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding" -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n" -"direkt als zum Verwerfen markiert." - -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n" +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" "direkt als zum Verwerfen markiert." -#: git-add--interactive.perl:1067 +#: git-add--interactive.perl:1058 #, perl-format msgid "failed to open hunk edit file for writing: %s" -msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" +msgstr "" +"Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" -#: git-add--interactive.perl:1068 +#: git-add--interactive.perl:1059 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n" "Kurzanleitung.\n" -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1065 #, perl-format msgid "" "---\n" @@ -15583,17 +15871,18 @@ msgstr "" "Zeilen, die mit %s beginnen, werden entfernt.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1073 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" "Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n" -"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt werden,\n" +"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt " +"werden,\n" "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n" -#: git-add--interactive.perl:1096 +#: git-add--interactive.perl:1087 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" @@ -15604,14 +15893,14 @@ msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1178 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n" "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?" -#: git-add--interactive.perl:1196 +#: git-add--interactive.perl:1187 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15621,11 +15910,13 @@ msgid "" msgstr "" "y - diesen Patch-Block zum Commit vormerken\n" "n - diesen Patch-Block nicht zum Commit vormerken\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit vormerken\n" +"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit " +"vormerken\n" "a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n" -"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit vormerken" +"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " +"vormerken" -#: git-add--interactive.perl:1202 +#: git-add--interactive.perl:1193 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15639,7 +15930,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" -#: git-add--interactive.perl:1208 +#: git-add--interactive.perl:1199 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15653,7 +15944,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" -#: git-add--interactive.perl:1214 +#: git-add--interactive.perl:1205 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15663,11 +15954,14 @@ msgid "" msgstr "" "y - diesen Patch-Block auf den Index anwenden\n" "n - diesen Patch-Block nicht auf den Index anwenden\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index anwenden\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index anwenden" +"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index " +"anwenden\n" +"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index " +"anwenden\n" +"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " +"anwenden" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1211 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15677,11 +15971,14 @@ msgid "" msgstr "" "y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n" "n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Arbeitsverzeichnis verwerfen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis verwerfen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im Arbeitsverzeichnis verwerfen" +"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im " +"Arbeitsverzeichnis verwerfen\n" +"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis " +"verwerfen\n" +"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " +"Arbeitsverzeichnis verwerfen" -#: git-add--interactive.perl:1226 +#: git-add--interactive.perl:1217 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15691,11 +15988,12 @@ msgid "" msgstr "" "y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n" "n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index und Arbeitsverzeichnis verwerfen\n" +"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index und " +"Arbeitsverzeichnis verwerfen\n" "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1223 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15709,7 +16007,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden" -#: git-add--interactive.perl:1241 +#: git-add--interactive.perl:1232 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15723,238 +16021,251 @@ msgid "" msgstr "" "g - Patch-Block zum Hinspringen auswählen\n" "/ - nach Patch-Block suchen der gegebenem regulärem Ausdruck entspricht\n" -"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block anzeigen\n" +"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block " +"anzeigen\n" "J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n" -"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-Block anzeigen\n" +"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-" +"Block anzeigen\n" "K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n" "s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n" "e - aktuellen Patch-Block manuell editieren\n" "? - Hilfe anzeigen\n" -#: git-add--interactive.perl:1272 +#: git-add--interactive.perl:1263 msgid "The selected hunks do not apply to the index!\n" -msgstr "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n" +msgstr "" +"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1264 msgid "Apply them to the worktree anyway? " msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? " -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1267 msgid "Nothing was applied.\n" msgstr "Nichts angewendet.\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1278 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoriere nicht zusammengeführte Datei: %s\n" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1287 msgid "Only binary files changed.\n" msgstr "Nur Binärdateien geändert.\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1289 msgid "No changes.\n" msgstr "Keine Änderungen.\n" -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1297 msgid "Patch update" msgstr "Patch Aktualisierung" -#: git-add--interactive.perl:1358 +#: git-add--interactive.perl:1349 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1350 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1351 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1363 +#: git-add--interactive.perl:1354 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung stashen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1355 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "Löschung stashen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1356 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block stashen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1368 +#: git-add--interactive.perl:1359 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1360 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1361 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1373 +#: git-add--interactive.perl:1364 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung auf Index anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1365 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "Löschung auf Index anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1366 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1378 +#: git-add--interactive.perl:1369 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1370 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1371 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1374 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " +msgstr "" +"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1375 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " +msgstr "" +"Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1376 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " +msgstr "" +"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/" +"%s,?]? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1379 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? " +msgstr "" +"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1380 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1381 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? " +msgstr "" +"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/" +"%s,?]? " -#: git-add--interactive.perl:1493 +#: git-add--interactive.perl:1484 msgid "go to which hunk (<ret> to see more)? " msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1486 msgid "go to which hunk? " msgstr "zu welchem Patch-Block springen? " -#: git-add--interactive.perl:1504 +#: git-add--interactive.perl:1495 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ungültige Nummer: '%s'\n" -#: git-add--interactive.perl:1509 +#: git-add--interactive.perl:1500 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n" msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n" -#: git-add--interactive.perl:1535 +#: git-add--interactive.perl:1526 msgid "search for regex? " msgstr "Suche nach regulärem Ausdruck? " -#: git-add--interactive.perl:1548 +#: git-add--interactive.perl:1539 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" -#: git-add--interactive.perl:1558 +#: git-add--interactive.perl:1549 msgid "No hunk matches the given pattern\n" msgstr "Kein Patch-Block entspricht dem angegebenen Pattern\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 msgid "No previous hunk\n" msgstr "Kein vorheriger Patch-Block\n" -#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 msgid "No next hunk\n" msgstr "Kein folgender Patch-Block\n" -#: git-add--interactive.perl:1606 +#: git-add--interactive.perl:1597 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "In %d Patch-Block aufgeteilt.\n" msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n" -#: git-add--interactive.perl:1658 +#: git-add--interactive.perl:1649 msgid "Review diff" msgstr "Diff überprüfen" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1677 +#: git-add--interactive.perl:1668 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" -"diff\t - view diff between HEAD and index\n" +"diff - view diff between HEAD and index\n" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" "status - Pfade mit Änderungen anzeigen\n" -"update - Zustand des Arbeitsverzeichnisses den zum Commit vorgemerkten Änderungen hinzufügen\n" -"revert - zum Commit vorgemerkten Änderungen auf HEAD Version zurücksetzen\n" +"update - Zustand des Arbeitsverzeichnisses den zum Commit " +"vorgemerkten Änderungen hinzufügen\n" +"revert - zum Commit vorgemerkte Änderungen auf HEAD Version " +"zurücksetzen\n" "patch - Patch-Blöcke auswählen und selektiv aktualisieren\n" -"diff\t - Unterschiede zwischen HEAD und Index anzeigen\n" +"diff - Unterschiede zwischen HEAD und Index anzeigen\n" "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" -#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 -#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 -#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 +#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 +#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 msgid "missing --" msgstr "-- fehlt" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1706 #, perl-format msgid "unknown --patch mode: %s" msgstr "Unbekannter --patch Modus: %s" -#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ungültiges Argument %s, erwarte --" #: git-send-email.perl:121 msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "lokale Zeitzone unterscheidet sich von GMT nicht um einen Minutenintervall\n" +msgstr "" +"lokale Zeitzone unterscheidet sich von GMT nicht um einen Minutenintervall\n" #: git-send-email.perl:128 git-send-email.perl:134 msgid "local time offset greater than or equal to 24 hours\n" @@ -15968,7 +16279,8 @@ msgstr "Der Editor wurde unsauber beendet, breche alles ab." #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" -msgstr "'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n" +msgstr "" +"'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n" #: git-send-email.perl:287 #, perl-format @@ -15981,7 +16293,8 @@ msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n" #: git-send-email.perl:368 git-send-email.perl:623 msgid "Cannot run git format-patch from outside a repository\n" -msgstr "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n" +msgstr "" +"Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n" #: git-send-email.perl:437 #, perl-format @@ -15996,7 +16309,8 @@ msgstr "Unbekannte --confirm Einstellung: '%s'\n" #: git-send-email.perl:498 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n" +msgstr "" +"Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n" #: git-send-email.perl:500 #, perl-format @@ -16027,7 +16341,8 @@ msgstr "" "indem Sie ...\n" "\n" " * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n" -" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich meinen\n" +" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich " +"meinen\n" #: git-send-email.perl:610 #, perl-format @@ -16048,7 +16363,10 @@ msgid "" "\n" "No patch files specified!\n" "\n" -msgstr "\nkeine Patch-Dateien angegeben!\n\n" +msgstr "" +"\n" +"keine Patch-Dateien angegeben!\n" +"\n" #: git-send-email.perl:658 #, perl-format @@ -16072,7 +16390,8 @@ msgstr "" "Ziehen Sie in Betracht, einen allgemeinen \"diffstat\" oder ein\n" "Inhaltsverzeichnis, für den Patch den Sie schreiben, hinzuzufügen.\n" "\n" -"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden möchten.\n" +"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden " +"möchten.\n" #: git-send-email.perl:701 #, perl-format @@ -16086,7 +16405,8 @@ msgstr "Fehler beim Öffnen von %s: %s" #: git-send-email.perl:739 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" -msgstr "To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n" +msgstr "" +"To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n" #: git-send-email.perl:748 msgid "Summary email is empty, skipping it\n" @@ -16120,7 +16440,8 @@ msgid "" msgstr "" "Versand zurückgewiesen, weil der Patch\n" "\t%s\n" -"die Betreffzeilenvorlage '*** SUBJECT HERE ***' enthält. Geben Sie --force an,\n" +"die Betreffzeilenvorlage '*** SUBJECT HERE ***' enthält. Geben Sie --force " +"an,\n" "wenn Sie den Patch wirklich versenden wollen.\n" #: git-send-email.perl:841 @@ -16134,7 +16455,9 @@ msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n" #: git-send-email.perl:871 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " -msgstr "Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine existiert)? " +msgstr "" +"Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine " +"existiert)? " #: git-send-email.perl:921 git-send-email.perl:929 #, perl-format @@ -16146,7 +16469,9 @@ msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n" #. at this point. #: git-send-email.perl:933 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten [e]): " +msgstr "" +"Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten " +"[e]): " #: git-send-email.perl:1234 #, perl-format @@ -16166,13 +16491,16 @@ msgid "" " run 'git config --global sendemail.confirm auto'.\n" "\n" msgstr "" -" Die Cc-Liste oberhalb wurde um zusätzliche Adressen erweitert, die in der\n" -" Commit-Beschreibung des Patches gefunden wurden. Wenn dies passiert, werden\n" +" Die Cc-Liste oberhalb wurde um zusätzliche Adressen erweitert, die in " +"der\n" +" Commit-Beschreibung des Patches gefunden wurden. Wenn dies passiert, " +"werden\n" " Sie von send-email zu einer Eingabe aufgefordert. Dieses Verhalten wird\n" " durch die Konfigurationseinstellung sendemail.confirm gesteuert.\n" "\n" " Für weitere Informationen, führen Sie 'git send-email --help' aus.\n" -" Um das aktuelle Verhalten beizubehalten, aber diese Meldung zu unterdrücken,\n" +" Um das aktuelle Verhalten beizubehalten, aber diese Meldung zu " +"unterdrücken,\n" " führen Sie 'git config --global sendemail.confirm auto' aus.\n" "\n" @@ -16199,7 +16527,8 @@ msgstr "Server unterstützt kein STARTTLS! %s" #: git-send-email.perl:1403 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -"Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre Konfiguration\n" +"Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre " +"Konfiguration\n" "und benutzen Sie --smtp-debug." #: git-send-email.perl:1421 @@ -16302,6 +16631,94 @@ msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " +#~ msgid "tag: tagging " +#~ msgstr "tag: tagge " + +#~ msgid "object of unknown type" +#~ msgstr "Art des Objektes unbekannt" + +#~ msgid "commit object" +#~ msgstr "Commit-Objekt" + +#~ msgid "tree object" +#~ msgstr "Tree-Objekt" + +#~ msgid "blob object" +#~ msgstr "Blob-Objekt" + +#~ msgid "other tag object" +#~ msgstr "anderes Tag-Objekt" + +#, fuzzy +#~ msgid "Submodule '%s' cannot checkout new HEAD" +#~ msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" + +#~ msgid "insanely long object directory %.*s" +#~ msgstr "zu langes Objekt-Verzeichnis %.*s" + +#~ msgid "tag name too long: %.*s..." +#~ msgstr "Tagname zu lang: %.*s..." + +#~ msgid "tag header too big." +#~ msgstr "Tag-Kopf zu groß." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding" +#~ msgstr "" +#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +#~ "Block\n" +#~ "direkt als zum Verwerfen markiert." + +#~ msgid "" +#~ "There is nothing to exclude from by :(exclude) patterns.\n" +#~ "Perhaps you forgot to add either ':/' or '.' ?" +#~ msgstr "" +#~ ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" +#~ "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?" + +#~ msgid "unrecognized format: %%(%s)" +#~ msgstr "nicht erkanntes Format: %%(%s)" + +#~ msgid ":strip= requires a positive integer argument" +#~ msgstr ":strip= erfordert eine positive Ganzzahl als Argument" + +#~ msgid "ref '%s' does not have %ld components to :strip" +#~ msgstr "Referenz '%s' hat keine %ld Komponenten für :strip" + +#~ msgid "unknown %.*s format %s" +#~ msgstr "Unbekanntes %.*s Format %s" + +#~ msgid "[%s: gone]" +#~ msgstr "[%s: entfernt]" + +#~ msgid "[%s]" +#~ msgstr "[%s]" + +#~ msgid "[%s: behind %d]" +#~ msgstr "[%s: %d hinterher]" + +#~ msgid "[%s: ahead %d]" +#~ msgstr "[%s: %d voraus]" + +#~ msgid "[%s: ahead %d, behind %d]" +#~ msgstr "[%s: %d voraus, %d hinterher]" + +#~ msgid " **** invalid ref ****" +#~ msgstr " **** ungültige Referenz ****" + +#~ msgid "git merge [<options>] <msg> HEAD <commit>" +#~ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" + +#~ msgid "'%s' is not a commit" +#~ msgstr "'%s' ist kein Commit" + +#~ msgid "cannot open file '%s'" +#~ msgstr "Kann Datei '%s' nicht öffnen" + +#~ msgid "could not close file %s" +#~ msgstr "Konnte Datei '%s' nicht schließen." + #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" #~ msgstr "" #~ "eine experimentelle, auf Leerzeilen basierende Heuristik zur " @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-04-23 09:54+0800\n" -"PO-Revision-Date: 2017-05-02 22:20+0200\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"PO-Revision-Date: 2017-05-05 12:02+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -671,7 +671,7 @@ msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 @@ -688,7 +688,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4917 builtin/am.c:2286 +#: apply.c:4917 builtin/am.c:2285 msgid "num" msgstr "num" @@ -742,7 +742,7 @@ 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:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" @@ -750,7 +750,7 @@ msgstr "les chemins sont séparés par un caractère NUL" msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4949 builtin/am.c:2265 +#: apply.c:4949 builtin/am.c:2264 msgid "action" msgstr "action" @@ -796,7 +796,7 @@ msgstr "" 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:4973 builtin/am.c:2274 +#: apply.c:4973 builtin/am.c:2273 msgid "root" msgstr "racine" @@ -844,9 +844,9 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 #: parse-options.h:153 msgid "file" @@ -932,27 +932,27 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: bisect.c:443 +#: bisect.c:444 #, c-format msgid "Could not open file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: bisect.c:448 +#: bisect.c:449 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:656 +#: bisect.c:657 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:709 +#: bisect.c:710 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:733 +#: bisect.c:734 #, c-format msgid "" "The merge base %s is bad.\n" @@ -961,7 +961,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:738 +#: bisect.c:739 #, c-format msgid "" "The merge base %s is new.\n" @@ -970,7 +970,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:743 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is %s.\n" @@ -979,7 +979,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:751 +#: bisect.c:752 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -990,7 +990,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:764 +#: bisect.c:765 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1002,36 +1002,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:799 +#: bisect.c:800 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:850 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:918 +#: bisect.c:919 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:948 +#: bisect.c:949 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:968 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:976 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -1040,7 +1040,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:995 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1049,7 +1049,7 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with #. "(roughly %d steps)" translation -#: bisect.c:999 +#: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1211,7 +1211,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -1220,7 +1220,7 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 #: builtin/merge.c:359 builtin/shortlog.c:176 @@ -1285,8 +1285,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -1314,163 +1314,169 @@ msgstr "plus de mémoire" #: config.c:191 msgid "relative config include conditionals must come from files" -msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers" +msgstr "" +"les conditions d'inclusion de configuration relative doivent venir de " +"fichiers" -#: config.c:701 +#: config.c:711 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:705 +#: config.c:715 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:709 +#: config.c:719 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:713 +#: config.c:723 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:717 +#: config.c:727 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:721 +#: config.c:731 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:840 +#: config.c:859 msgid "out of range" msgstr "hors plage" -#: config.c:840 +#: config.c:859 msgid "invalid unit" msgstr "unité invalide" -#: config.c:846 +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:851 +#: config.c:870 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:854 +#: config.c:873 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:857 +#: config.c:876 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:860 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:863 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:866 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:953 +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:1048 config.c:1059 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1176 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1332 +#: config.c:1359 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1522 +#: config.c:1557 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1572 +#: config.c:1611 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1931 +#: config.c:1970 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:1952 +#: config.c:1991 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par défaut" +msgstr "" +"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " +"défaut" -#: config.c:1978 +#: config.c:2017 #, 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" +msgstr "" +"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " +"100" -#: config.c:1989 +#: config.c:2028 #, 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:1991 +#: config.c:2030 #, 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:2050 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2384 config.c:2609 +#: config.c:2423 config.c:2648 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2502 +#: config.c:2541 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2504 builtin/remote.c:774 +#: config.c:2543 builtin/remote.c:774 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" @@ -1723,171 +1729,176 @@ msgstr "git fetch-pack : list courte attendue" msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu" -#: fetch-pack.c:279 +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "erreur distante : %s" + +#: fetch-pack.c:281 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:331 +#: fetch-pack.c:333 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:417 +#: fetch-pack.c:419 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:423 +#: fetch-pack.c:425 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:428 +#: fetch-pack.c:430 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:433 +#: fetch-pack.c:435 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:472 +#: fetch-pack.c:474 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:486 +#: fetch-pack.c:488 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:519 +#: fetch-pack.c:521 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:529 progress.c:235 +#: fetch-pack.c:531 progress.c:235 msgid "done" msgstr "fait" -#: fetch-pack.c:541 +#: fetch-pack.c:543 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:587 +#: fetch-pack.c:589 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:735 +#: fetch-pack.c:737 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:773 +#: fetch-pack.c:775 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:781 +#: fetch-pack.c:783 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:837 +#: fetch-pack.c:839 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:853 +#: fetch-pack.c:855 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:855 +#: fetch-pack.c:857 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:882 +#: fetch-pack.c:884 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:886 +#: fetch-pack.c:888 msgid "Server supports multi_ack_detailed" msgstr "Le serveur supporte multi_ack_detailed" -#: fetch-pack.c:889 +#: fetch-pack.c:891 msgid "Server supports no-done" msgstr "Le serveur support no-done" -#: fetch-pack.c:895 +#: fetch-pack.c:897 msgid "Server supports multi_ack" msgstr "Le serveur supporte multi_ack" -#: fetch-pack.c:899 +#: fetch-pack.c:901 msgid "Server supports side-band-64k" msgstr "Le serveur supporte side-band-64k" -#: fetch-pack.c:903 +#: fetch-pack.c:905 msgid "Server supports side-band" msgstr "Le serveru supporte side-band" -#: fetch-pack.c:907 +#: fetch-pack.c:909 msgid "Server supports allow-tip-sha1-in-want" msgstr "Le serveur supporte allow-tip-sha1-in-want" -#: fetch-pack.c:911 +#: fetch-pack.c:913 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Le serveur supporte allow-reachable-sha1-in-want" -#: fetch-pack.c:921 +#: fetch-pack.c:923 msgid "Server supports ofs-delta" msgstr "Le serveur support ofs-delta" -#: fetch-pack.c:928 +#: fetch-pack.c:930 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:934 +#: fetch-pack.c:936 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:938 +#: fetch-pack.c:940 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:940 +#: fetch-pack.c:942 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:951 +#: fetch-pack.c:953 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:963 +#: fetch-pack.c:965 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1125 +#: fetch-pack.c:1127 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1147 +#: fetch-pack.c:1149 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1150 +#: fetch-pack.c:1152 #, 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é" @@ -2077,7 +2088,7 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 #: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -2162,7 +2173,9 @@ msgstr "" msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " +"%s de %s laissée dans l'arbre." #: merge-recursive.c:1104 #, c-format @@ -2178,7 +2191,9 @@ msgstr "" msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " +"%s de %s laissée dans l'arbre dans le fichier %s." #: merge-recursive.c:1143 msgid "rename" @@ -2408,14 +2423,16 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:805 +#: path.c:810 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" #: pathspec.c:125 msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une valeur d'attribut" +msgstr "" +"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une " +"valeur d'attribut" #: pathspec.c:143 msgid "Only one 'attr:' specification is allowed." @@ -2508,7 +2525,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: read-cache.c:1307 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2517,7 +2534,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1317 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2526,42 +2543,41 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:2232 -#, c-format -msgid "could not stat '%s" -msgstr "stat impossible de '%s'" - -#: read-cache.c:2232 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:2245 +#: read-cache.c:2388 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:2257 +#: read-cache.c:2400 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: refs.c:619 builtin/merge.c:844 +#: refs.c:620 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: refs/files-backend.c:2531 +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "mises à jour des références interdites en environnement de quarantaine" + +#: refs/files-backend.c:1631 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:1634 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" -#: refs/files-backend.c:2543 +#: refs/files-backend.c:1643 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" @@ -3010,12 +3026,12 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:294 sequencer.c:1675 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" @@ -3025,12 +3041,12 @@ 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:305 sequencer.c:1558 sequencer.c:1682 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "échec lors de la finalisation de '%s'." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 #: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" @@ -3206,7 +3222,7 @@ msgstr "impossible d'obtenir un message de validation pour %s" msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1071 sequencer.c:1820 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" @@ -3235,124 +3251,124 @@ msgstr "git %s : échec à la lecture de l'index" msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:1302 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:1310 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:1342 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:1349 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:1351 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:1356 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:1367 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:1369 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:1432 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: sequencer.c:1435 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:1492 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:1530 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:1531 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:1534 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:1548 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:1604 sequencer.c:2159 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:1606 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:1608 sequencer.c:1642 +#: sequencer.c:1615 sequencer.c:1649 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:1628 builtin/grep.c:910 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:1630 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:1631 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:1637 +#: sequencer.c:1644 #, 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:1648 +#: sequencer.c:1655 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:1785 sequencer.c:2058 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1825 builtin/difftool.c:616 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:1841 +#: sequencer.c:1848 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:1846 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3367,11 +3383,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:1852 +#: sequencer.c:1859 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:1858 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3388,17 +3404,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1913 git-rebase.sh:168 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "Autoremisage appliqué." -#: sequencer.c:1925 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:1927 git-rebase.sh:172 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3409,57 +3425,57 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:2009 +#: sequencer.c:2016 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:2036 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:2066 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:2070 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:2077 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:2084 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:2168 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:2173 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:2182 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:2184 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:2186 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:2189 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3469,21 +3485,21 @@ msgstr "" "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:2199 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:2279 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:2283 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:2316 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" @@ -3693,7 +3709,7 @@ msgstr "impossible de lancer 'git status' dans le sous-module '%s'" msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1679 +#: submodule.c:1678 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3701,18 +3717,18 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:1691 submodule.c:1747 +#: submodule.c:1690 submodule.c:1746 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:1695 builtin/submodule--helper.c:678 +#: submodule.c:1694 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" -#: submodule.c:1698 +#: submodule.c:1697 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3723,20 +3739,20 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:1782 +#: submodule.c:1781 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:1826 +#: submodule.c:1825 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:1846 +#: submodule.c:1845 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?" -#: submodule.c:1865 +#: submodule.c:1864 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" @@ -4110,7 +4126,9 @@ msgstr "Abandon\n" #: unpack-trees.c:272 #, c-format msgid "submodule update strategy not supported for submodule '%s'" -msgstr "stratégie de mise à jour de sous-module non supportée pour le sous-module '%s'" +msgstr "" +"stratégie de mise à jour de sous-module non supportée pour le sous-module " +"'%s'" #: unpack-trees.c:340 msgid "Checking out files" @@ -4160,8 +4178,8 @@ msgstr "impossible d'ouvrir '%s' en lecture/écriture" msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -4833,110 +4851,110 @@ msgstr "Vous vouliez sûrement dire 'git add .' ?\n" msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/am.c:414 +#: builtin/am.c:412 msgid "could not parse author script" msgstr "impossible d'analyser le script author" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:840 +#: builtin/am.c:842 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:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:989 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1127 builtin/commit.c:376 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1176 +#: builtin/am.c:1178 #, 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:1177 +#: builtin/am.c:1179 #, 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:1178 +#: builtin/am.c:1180 #, 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:1316 +#: builtin/am.c:1315 msgid "Patch is empty. Was it split wrong?" msgstr "Le patch est vide. Le découpage était-il bon ?" -#: builtin/am.c:1390 builtin/log.c:1557 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/am.c:1417 +#: builtin/am.c:1413 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1610 +#: builtin/am.c:1606 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:1612 +#: builtin/am.c:1608 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:1631 +#: builtin/am.c:1627 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4944,38 +4962,38 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1637 +#: builtin/am.c:1633 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1662 +#: builtin/am.c:1658 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1686 builtin/merge.c:631 +#: builtin/am.c:1682 builtin/merge.c:631 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/am.c:1693 +#: builtin/am.c:1689 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 #: builtin/merge.c:827 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1759 +#: builtin/am.c:1755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'être interactif sans entrée standard connectée à un terminal." -#: builtin/am.c:1764 +#: builtin/am.c:1760 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -4983,35 +5001,35 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1770 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:1824 +#: builtin/am.c:1820 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1876 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1885 +#: builtin/am.c:1884 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1890 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copie du patch qui a échoué se trouve dans : %s" -#: builtin/am.c:1936 +#: builtin/am.c:1935 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5022,7 +5040,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1943 +#: builtin/am.c:1942 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -5030,17 +5048,17 @@ msgstr "" "Vous avez toujours des chemins non fusionnés dans votre index\n" "Auriez-vous oublié de faire 'git add' ?" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2103 +#: builtin/am.c:2102 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2137 +#: builtin/am.c:2136 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5048,76 +5066,76 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2233 +#: builtin/am.c:2232 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --quit | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2242 +#: builtin/am.c:2241 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:178 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2247 +#: builtin/am.c:2246 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2252 +#: builtin/am.c:2251 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2254 +#: builtin/am.c:2253 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2258 +#: builtin/am.c:2257 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:2261 +#: builtin/am.c:2260 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:2264 +#: builtin/am.c:2263 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 +#: builtin/am.c:2292 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 @@ -5125,58 +5143,58 @@ msgstr "le passer jusqu'à git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2290 +#: builtin/am.c:2289 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2296 +#: builtin/am.c:2295 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:2298 +#: builtin/am.c:2297 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2311 +#: builtin/am.c:2310 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2316 +#: builtin/am.c:2315 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2334 +#: builtin/am.c:2333 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." @@ -5184,17 +5202,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2341 +#: builtin/am.c:2340 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2356 +#: builtin/am.c:2355 #, 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:2380 +#: builtin/am.c:2379 #, c-format msgid "" "Stray %s directory found.\n" @@ -5203,7 +5221,7 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2386 +#: builtin/am.c:2385 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 " @@ -5235,11 +5253,6 @@ msgstr "git archive : ACK/NACK attendu, EOF reçu" msgid "git archive: NACK %s" msgstr "git archive : NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "erreur distante : %s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive : erreur de protocole" @@ -5934,7 +5947,7 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -6028,7 +6041,7 @@ msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:174 builtin/column.c:30 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:472 +#: builtin/worktree.c:477 msgid "string" msgstr "chaîne" @@ -6248,8 +6261,8 @@ 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:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325 -#: builtin/worktree.c:327 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "branche" @@ -6265,7 +6278,7 @@ msgstr "créer/réinitialiser et extraire une branche" msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1164 builtin/worktree.c:329 +#: builtin/checkout.c:1164 builtin/worktree.c:333 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" @@ -6516,7 +6529,7 @@ msgid "remove whole directories" msgstr "supprimer les répertoires entiers" #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 #: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "motif" @@ -6774,7 +6787,7 @@ msgstr "impossible de remballer pour nettoyer" msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:884 builtin/receive-pack.c:1901 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "Trop d'arguments." @@ -6813,7 +6826,7 @@ msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" @@ -7275,7 +7288,7 @@ msgid "version" msgstr "version" #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:443 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -7358,7 +7371,7 @@ msgstr "auteur" msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1588 builtin/gc.c:353 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "date" @@ -7522,142 +7535,142 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "Action" msgstr "Action" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "Type" msgstr "Type" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "Other" msgstr "Autre" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:327 +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:471 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7672,12 +7685,12 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/config.c:623 +#: builtin/config.c:627 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7842,7 +7855,8 @@ msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" #: builtin/describe.c:459 msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" +msgstr "" +"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" #: builtin/describe.c:477 msgid "--long is incompatible with --abbrev=0" @@ -8478,12 +8492,12 @@ msgstr "git gc [<options>]" msgid "Failed to fstat %s: %s" msgstr "Échec du stat de %s : %s" -#: builtin/gc.c:306 +#: builtin/gc.c:310 #, c-format msgid "Can't stat %s" msgstr "impossible de faire un stat de %s" -#: builtin/gc.c:315 +#: builtin/gc.c:319 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8499,47 +8513,47 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:354 +#: builtin/gc.c:358 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:356 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:357 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:358 +#: builtin/gc.c:362 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:375 +#: builtin/gc.c:379 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "impossible de lire la valeur de gc.logexpiry %s" -#: builtin/gc.c:403 +#: builtin/gc.c:407 #, 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:405 +#: builtin/gc.c:409 #, 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:406 +#: builtin/gc.c:410 #, 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:427 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8547,7 +8561,7 @@ msgstr "" "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:471 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8780,7 +8794,8 @@ msgstr "aucun motif fourni." #: builtin/grep.c:1189 msgid "--no-index or --untracked cannot be used with revs" -msgstr "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" +msgstr "" +"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" #: builtin/grep.c:1195 #, c-format @@ -9765,106 +9780,106 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:512 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:514 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:516 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:518 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:520 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:522 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:534 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:529 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:553 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:548 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:558 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:554 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:563 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:557 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:565 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:560 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "afficher les données de débogage" @@ -11351,7 +11366,7 @@ msgstr "Référez-vous à git-pull(1) pour de plus amples détails." msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" @@ -11840,7 +11855,7 @@ msgstr "abandonner le rebasage" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:796 +#: builtin/receive-pack.c:795 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" @@ -11870,7 +11885,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:816 +#: builtin/receive-pack.c:815 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" @@ -11890,11 +11905,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1889 +#: builtin/receive-pack.c:1888 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1903 +#: builtin/receive-pack.c:1902 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -12538,22 +12553,22 @@ msgstr "git replace -d <objet>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "Nom d'objet invalide : '%s'" -#: builtin/replace.c:359 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:361 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:372 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12562,45 +12577,45 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:405 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "le commit original '%s' contient une signature GPG." -#: builtin/replace.c:406 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:412 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:436 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "use this format" msgstr "utiliser ce format" @@ -13231,7 +13246,7 @@ msgstr "ancre alternative pour les chemins relatifs" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" @@ -13241,7 +13256,9 @@ msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." -msgstr "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme son propre amont d'autorité." +msgstr "" +"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " +"son propre amont d'autorité." #: builtin/submodule--helper.c:406 #, c-format @@ -13485,7 +13502,8 @@ msgid "" "points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <objet>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <objet>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]" #: builtin/tag.c:27 @@ -13551,30 +13569,6 @@ msgstr "pas de message pour l'étiquette ?" msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:312 -msgid "tag: tagging " -msgstr "étiquette: étiquetage de " - -#: builtin/tag.c:320 -msgid "object of unknown type" -msgstr "objet de type inconnu" - -#: builtin/tag.c:327 -msgid "commit object" -msgstr "objet commit" - -#: builtin/tag.c:335 -msgid "tree object" -msgstr "objet arbre" - -#: builtin/tag.c:338 -msgid "blob object" -msgstr "objet blob" - -#: builtin/tag.c:341 -msgid "other tag object" -msgstr "objet étiquette autre" - #: builtin/tag.c:397 msgid "list tag names" msgstr "afficher les noms des étiquettes" @@ -13669,7 +13663,8 @@ msgstr "l'option --points-at est autorisée seulement en mode liste" #: builtin/tag.c:499 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" +msgstr "" +"les options --merged et --no-merged ne sont autorisées qu'en mode liste" #: builtin/tag.c:510 msgid "only one -F or -m option is allowed." @@ -13893,13 +13888,17 @@ msgstr "activer le cache de non-suivis sans tester le système de fichier" msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" -msgstr "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer l'index coupé" +msgstr "" +"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " +"souhaitez vraiment activer l'index coupé" #: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" -msgstr "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver l'index coupé" +msgstr "" +"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver l'index coupé" #: builtin/update-index.c:1127 msgid "" @@ -14016,28 +14015,28 @@ msgstr "git worktree prune [<options>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:43 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:48 +#: builtin/worktree.c:49 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:53 +#: builtin/worktree.c:54 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:80 +#: builtin/worktree.c:81 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" @@ -14057,63 +14056,67 @@ msgstr "faire expirer les arbres de travail plus vieux que <temps>" msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:236 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:272 +#: builtin/worktree.c:274 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Préparation de %s (identifiant %s)" -#: builtin/worktree.c:324 +#: builtin/worktree.c:328 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:326 +#: builtin/worktree.c:330 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:328 +#: builtin/worktree.c:332 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:330 +#: builtin/worktree.c:334 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:338 +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" +msgstr "conserver le verrou sur le nouvel arbre de travail" + +#: builtin/worktree.c:343 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:473 +#: builtin/worktree.c:478 msgid "reason for locking" msgstr "raison du vérouillage" -#: builtin/worktree.c:485 builtin/worktree.c:518 +#: builtin/worktree.c:490 builtin/worktree.c:523 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:487 builtin/worktree.c:520 +#: builtin/worktree.c:492 builtin/worktree.c:525 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être vérouillée ou dévérouillée" -#: builtin/worktree.c:492 +#: builtin/worktree.c:497 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:494 +#: builtin/worktree.c:499 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:522 +#: builtin/worktree.c:527 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" @@ -14183,15 +14186,20 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: http.c:355 +#: http.c:336 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" + +#: http.c:357 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" -#: http.c:364 +#: http.c:366 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" -#: http.c:1755 +#: http.c:1766 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14584,7 +14592,7 @@ msgstr "Essai de fusion simple avec $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "La fusion simple a échoué, essai avec la fusion automatique." -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -14596,39 +14604,39 @@ msgstr "" "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " "rebase --abort\"." -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:216 +#: git-rebase.sh:217 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Il semble que git-am soit en cours. Impossible de rebaser." -#: git-rebase.sh:357 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:368 +#: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: git-rebase.sh:375 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14636,7 +14644,7 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14658,65 +14666,65 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:614 +#: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Premièrement, rembobinons head pour rejouer votre travail par-dessus..." -#: git-rebase.sh:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -16127,7 +16135,8 @@ msgid "" "changes\n" msgstr "" "status - montrer les chemins modifiés\n" -"update - ajouter l'état de l'arbre de travail aux modifications à indexer\n" +"update - ajouter l'état de l'arbre de travail aux modifications à " +"indexer\n" "revert - faire revenir les modifications à indexer à la version HEAD\n" "patch - sélectionner les sections et mettre à jour sélectivement\n" "diff - visualiser les diff entre HEAD et l'index\n" @@ -16508,6 +16517,27 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "could not stat '%s" +#~ msgstr "stat impossible de '%s'" + +#~ msgid "tag: tagging " +#~ msgstr "étiquette: étiquetage de " + +#~ msgid "object of unknown type" +#~ msgstr "objet de type inconnu" + +#~ msgid "commit object" +#~ msgstr "objet commit" + +#~ msgid "tree object" +#~ msgstr "objet arbre" + +#~ msgid "blob object" +#~ msgstr "objet blob" + +#~ msgid "other tag object" +#~ msgstr "objet étiquette autre" + #~ msgid "" #~ "There is nothing to exclude from by :(exclude) patterns.\n" #~ "Perhaps you forgot to add either ':/' or '.' ?" |