Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po
l10n-2.11.0-rnd3.1: update ru and ca translations
* tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po:
l10n: ru.po: update Russian translation
l10n: ca.po: update translation
diff --git a/po/ca.po b/po/ca.po
index 30e00e2..57d0e2f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-08-28 10:32-0600\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-28 20:03-0700\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 1.8.11\n"
#: advice.c:55
#, c-format
@@ -100,6 +100,631 @@
"\n"
" git checkout -b <nom-de-branca-nova>\n"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opció d'espai en blanc '%s' no reconeguda"
+
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject i --3way no es poden usar junts."
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached i --3way no es poden usar junts."
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way fora d'un dipòsit"
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index fora d'un dipòsit"
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached fora d'un dipòsit"
+
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "No es pot preparar l'expressió regular de marca de temps %s"
+
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec ha retornat %d per l'entrada: %s"
+
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
+
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
+
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
+
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
+
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
+
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recompte: línia inesperada: %.*s"
+
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
+
+#: apply.c:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
+"%d component de nom de camí inicial (línia %d)"
+msgstr[1] ""
+"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
+"%d components de nom de camí inicial (línia %d)"
+
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
+
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "el fitxer nou depèn dels continguts antics"
+
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "el fitxer suprimit encara té continguts"
+
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "pedaç malmès a la línia %d"
+
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "el fitxer nou %s depèn dels continguts antics"
+
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "el fitxer suprimit %s encara té continguts"
+
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
+
+#: apply.c:1984
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "pedaç binari malmès a la línia %d: %.*s"
+
+#: apply.c:2021
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "pedaç binari no reconegut a la línia %d"
+
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "pedaç amb només escombraries a la línia %d"
+
+#: apply.c:2274
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
+
+#: apply.c:2278
+#, c-format
+msgid "unable to open or read %s"
+msgstr "no s'ha pogut obrir o llegir %s"
+
+#: apply.c:2931
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "inici de línia no vàlid: '%c'"
+
+#: apply.c:3050
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
+msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
+
+#: apply.c:3062
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
+
+#: apply.c:3068
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"tot cercant:\n"
+"%.*s"
+
+#: apply.c:3090
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "manquen les dades de pedaç binari de '%s'"
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a '%s'"
+
+#: apply.c:3144
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"no es pot aplicar un pedaç binari a '%s' sense la línia d'índex completa"
+
+#: apply.c:3154
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts "
+"actuals."
+
+#: apply.c:3162
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "el pedaç s'aplica a un '%s' buit però no és buit"
+
+#: apply.c:3180
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "no es pot llegir la postimatge necessari %s per a '%s'"
+
+#: apply.c:3193
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "el pedaç binari no s'aplica a '%s'"
+
+#: apply.c:3199
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
+
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "el pedaç ha fallat: %s:%ld"
+
+#: apply.c:3342
+#, c-format
+msgid "cannot checkout %s"
+msgstr "no es pot agafar %s"
+
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr "s'ha fallat en llegir %s"
+
+#: apply.c:3398
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
+
+#: apply.c:3427 apply.c:3667
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
+
+#: apply.c:3510 apply.c:3681
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: no existeix en l'índex"
+
+#: apply.c:3519 apply.c:3689
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: no coincideix amb l'índex"
+
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
+
+#: apply.c:3557
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "S'està retrocedint a una fusió de 3 vies...\n"
+
+#: apply.c:3573 apply.c:3577
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "no es poden llegir els continguts actuals de '%s'"
+
+#: apply.c:3589
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "S'ha fallat en retrocedir a una fusió de 3 vies...\n"
+
+#: apply.c:3603
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n"
+
+#: apply.c:3608
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "S'ha aplicat el pedaç a '%s' netament.\n"
+
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
+
+#: apply.c:3706
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: tipus erroni"
+
+#: apply.c:3708
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s és del tipus %o, s'esperava %o"
+
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "camí no vàlid: %s"
+
+#: apply.c:3917
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: ja existeix en l'índex"
+
+#: apply.c:3920
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: ja existeix en el directori de treball"
+
+#: apply.c:3940
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
+
+#: apply.c:3945
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
+
+#: apply.c:3965
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
+
+#: apply.c:3969
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: el pedaç no s'aplica"
+
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "S'està comprovant el pedaç %s..."
+
+#: apply.c:4075
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "falta la informació sha1 o és inútil per al submòdul %s"
+
+#: apply.c:4082
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "canvi de mode per a %s, el qual no està en el HEAD actual"
+
+#: apply.c:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "falta informació sha1 o és inútil (%s)."
+
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry ha fallat per al camí '%s'"
+
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "no s'ha pogut afegir %s a l'index temporal"
+
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "no s'ha pogut escriure l'índex temporal a %s"
+
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "no s'ha pogut eliminar %s de l'índex"
+
+#: apply.c:4277
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "pedaç malmès per al submòdul %s"
+
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
+
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
+"%s"
+
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "no s'ha pogut afegir una entrada de cau per a %s"
+
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "s'ha fallat en escriure a '%s'"
+
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr "s'està tancant el fitxer '%s'"
+
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
+
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "El pedaç %s s'ha aplicat netament."
+
+#: apply.c:4518
+msgid "internal error"
+msgstr "error intern"
+
+#: apply.c:4521
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
+msgstr[1] "S'està aplicant el pedaç %%s amb %d rebuitjos..."
+
+#: apply.c:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
+
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr "no es pot obrir %s"
+
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "El tros #%d s'ha aplicat netament."
+
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "S'ha rebutjat el tros #%d."
+
+#: apply.c:4668
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "S'ha saltat el pedaç '%s'."
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "entrada no reconeguda"
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "no es pot llegir el fitxer d'índex"
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "no es pot obrir el pedaç '%s': %s"
+
+#: apply.c:4858
+#, 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:4864 apply.c:4879
+#, 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:4872
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+"S'ha aplicat %d línia desprès d'arreglar els errors d'espai en blanc."
+msgstr[1] ""
+"S'han aplicat %d línies desprès d'arreglar els errors d'espai en blanc."
+
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+
+#: apply.c:4919 apply.c:4922 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:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "camí"
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "no apliquis els canvis que coincideixin amb el camí donat"
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "aplica els canvis que coincideixin amb el camí donat"
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "número"
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+"elimina <nombre> barres obliqües inicials dels camins de diferència "
+"tradicionals"
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ignora afegiments fets pel pedaç"
+
+#: apply.c:4931
+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:4935
+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:4937
+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:4939
+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:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "aplica un pedaç sense tocar l'arbre de treball"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
+
+#: apply.c:4949
+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:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "els camins se separen amb el caràcter NUL"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "assegura't que almenys <n> línies de context coincideixin"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "acció"
+
+#: apply.c:4958
+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:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignora els canvis d'espai en blanc en cercar context"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "aplica el pedaç al revés"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "no esperis almenys una línia de context"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "deixa els trossos rebutjats en fitxers *.reg corresponents"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "permet trossos encavalcants"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "sigues detallat"
+
+#: apply.c:4976
+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:4979
+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:4981 builtin/am.c:2274
+msgid "root"
+msgstr "arrel"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "anteposa <arrel> a tots els noms de fitxer"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<opcions>] <arbre> [<camí>...]"
@@ -119,10 +744,10 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
-msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer"
+msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer"
#: archive.c:429
msgid "fmt"
@@ -132,7 +757,7 @@
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:430 builtin/log.c:1422
+#: archive.c:430 builtin/log.c:1429
msgid "prefix"
msgstr "prefix"
@@ -140,11 +765,11 @@
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/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
msgid "file"
msgstr "fitxer"
@@ -176,8 +801,8 @@
msgid "list supported archive formats"
msgstr "allista els formats d'arxiu admesos"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
msgid "repo"
msgstr "dipòsit"
@@ -185,7 +810,7 @@
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:483
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "ordre"
@@ -213,7 +838,7 @@
#: archive.c:494
#, c-format
msgid "Argument not supported for format '%s': -%d"
-msgstr "Paràmetre no admet per al format '%s': -%d"
+msgstr "Paràmetre no admès per al format '%s': -%d"
#: attr.c:263
msgid ""
@@ -277,7 +902,7 @@
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-"Unes %s revisions no són els avantpassats de la revisió %s.\n"
+"Unes revisions %s no són els avantpassats de la revisió %s.\n"
"git bisect no pot funcionar correctament en aquest cas.\n"
"Potser heu confós les revisions %s i %s?\n"
@@ -289,8 +914,8 @@
"We continue anyway."
msgstr ""
"s'ha de saltar la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
-"%s.\n"
+"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s "
+"i %s.\n"
"Continuem de totes maneres."
#: bisect.c:798
@@ -468,27 +1093,27 @@
"\"git push -u\" per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:266
+#: branch.c:265
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: '%s'."
-#: branch.c:286
+#: branch.c:285
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: '%s'."
-#: branch.c:291
+#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: '%s'."
-#: branch.c:345
+#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ja s'ha agafat a '%s'"
-#: branch.c:364
+#: branch.c:363
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
@@ -503,7 +1128,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:778
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir '%s'"
@@ -512,9 +1137,9 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 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:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@ -554,7 +1179,7 @@
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:1565 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
@@ -577,8 +1202,8 @@
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -588,6 +1213,17 @@
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
+#: commit.c:1514
+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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Advertència: el missatge de comissió no conformava a UTF-8.\n"
+"Potser voleu esemenar-lo després de corregir el missatge, o establir\n"
+"la variable de configuració i18n.commitencoding a la codificació que\n"
+"usi el vostre projecte.\n"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memòria esgotada"
@@ -673,9 +1309,9 @@
#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
-msgstr "s'ha fallat en expandir el directori d'usuari en '%s'"
+msgstr "s'ha fallat en expandir el directori d'usuari en: '%s'"
-#: config.c:849 config.c:860
+#: config.c:852 config.c:863
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib dolent %d"
@@ -718,22 +1354,68 @@
msgid "could not unset '%s'"
msgstr "no s'ha pogut desestablir '%s'"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "El costat remot ha penjat en el moment de contacte inicial"
+
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"No s'ha pogut llegir del dipòsit remot.\n"
+"\n"
+"Si us plau, assegureu-vos que tingueu els drets\n"
+"d'accés correctes i que el dipòsit existeixi."
+
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:74
+#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:94
+#: connected.c:95
msgid "failed write to rev-list"
-msgstr "escriptura fallada a rev-list"
+msgstr "escriptura fallada al rev-list"
-#: connected.c:101
+#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr "s'ha fallat en tancar l'stdin del rev-list"
+#: convert.c:201
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"LF reemplaçarà CRLF en %s.\n"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre "
+"directori de treball."
+
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "LF reemplaçaria CRLF en %s."
+
+#: convert.c:211
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"CRLF reemplaçarà LF en %s.\n"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre "
+"directori de treball."
+
+#: convert.c:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "CRLF reemplaçaria LF en %s"
+
#: date.c:97
msgid "in the future"
msgstr "en el futur"
@@ -807,27 +1489,32 @@
msgid "failed to read orderfile '%s'"
msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
-#: diffcore-rename.c:540
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-#: diff.c:116
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "l'opció '%s' requereix un valor"
+
+#: diff.c:124
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
-#: diff.c:121
+#: diff.c:129
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut '%s'\n"
-#: diff.c:225
+#: diff.c:283
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
-#: diff.c:277
+#: diff.c:346
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -836,16 +1523,20 @@
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:3017
+#: diff.c:3087
#, c-format
msgid "external diff died, stopping at %s"
-msgstr "El diff external s'ha mort, s'està aturant a %s"
+msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:3415
+#: diff.c:3412
+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:3502
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3578
+#: diff.c:3665
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -854,62 +1545,246 @@
"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3592
+#: diff.c:3679
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"
+msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: '%s'"
-#: dir.c:1823
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "s'ha saltat la detecció de canvi de nom a causa de massa fitxers."
+
+#: diff.c:4703
+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:4706
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
+"l'ordre."
+
+#: dir.c:1866
msgid "failed to get kernel name and information"
msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"
-#: dir.c:1942
+#: dir.c:1985
msgid "Untracked cache is disabled on this system or location."
msgstr ""
"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
-#: gpg-interface.c:178
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: llista superficial esperada"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
+
+#: fetch-pack.c:243
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
+
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc requereix multi_ack_detailed"
+
+#: fetch-pack.c:381
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "línia de shallow no vàlida: %s"
+
+#: fetch-pack.c:387
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "línia d'unshallow no vàlida: %s"
+
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
+msgstr "objecte no trobat: %s"
+
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
+msgstr "error en objecte: %s"
+
+#: fetch-pack.c:394
+#, c-format
+msgid "no shallow found: %s"
+msgstr "no s'ha trobat cap superficial: %s"
+
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+
+#: fetch-pack.c:436
+#, c-format
+msgid "got %s %d %s"
+msgstr "%s %d %s rebut"
+
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr "comissió no vàlida %s"
+
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "s'està rendint"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "fet"
+
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "s'ha rebut %s (%d) %s"
+
+#: fetch-pack.c:551
+#, c-format
+msgid "Marking %s as complete"
+msgstr "S'està marcant %s com a complet"
+
+#: fetch-pack.c:697
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ja es té %s (%s)"
+
+#: fetch-pack.c:735
+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
+msgid "protocol error: bad pack header"
+msgstr "error de protocol: capçalera de paquet dolent"
+
+#: fetch-pack.c:799
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: no es pot bifurcar de %s"
+
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "%s ha fallat"
+
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "error en demultiplexor de banda lateral"
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "El servidor no permet clients superficials"
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "El servidor accepta multi_ack_detailed"
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "El servidor accepta no-done"
+
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "El servidor accepta multi_ack"
+
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "El servidor accepta side-band-64k"
+
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "El servidor accepta banda lateral"
+
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "El servidor accepta allow-tip-sha1-in-want"
+
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "El servidor accepta allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "El servidor accepta ofs-delta"
+
+#: fetch-pack.c:890
+#, c-format
+msgid "Server version is %.*s"
+msgstr "La versió del servidor és %.*s"
+
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "El servidor no admet --shallow-since"
+
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "El servidor no admet --shallow-exclude"
+
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "El servidor no admet --deepen"
+
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "cap comissió en comú"
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: l'obtenció ha fallat."
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "no hi ha cap cap remot coincident"
+
+#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
-#: gpg-interface.c:208
+#: gpg-interface.c:215
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:210
+#: gpg-interface.c:217
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "s'ha fallat en escriure la signatura separada a '%s'"
-#: grep.c:1792
+#: grep.c:1782
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no s'ha pogut llegir %s"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha fallat en fer stat a '%s'"
-#: grep.c:1820
+#: grep.c:1810
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura curta"
-#: help.c:205
+#: help.c:203
#, c-format
msgid "available git commands in '%s'"
msgstr "ordres de git disponibles en '%s'"
-#: help.c:212
+#: help.c:210
msgid "git commands available from elsewhere on your $PATH"
msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-#: help.c:244
+#: help.c:241
msgid "These are common Git commands used in various situations:"
msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"
-#: help.c:309
+#: help.c:306
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -918,11 +1793,11 @@
"'%s' sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui estropejat?"
-#: help.c:366
+#: help.c:361
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
-#: help.c:388
+#: help.c:383
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -932,17 +1807,17 @@
"existeix.\n"
"S'està continuant sota l'assumpció que volíeu dir '%s'"
-#: help.c:393
+#: help.c:388
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "en %0.1f segons automàticament..."
-#: help.c:400
+#: help.c:395
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'."
-#: help.c:404 help.c:470
+#: help.c:399 help.c:465
msgid ""
"\n"
"Did you mean this?"
@@ -956,11 +1831,36 @@
"\n"
"Volíeu dir un d'aquests?"
-#: help.c:466
+#: help.c:461
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: ident.c:334
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Si us plau, digueu-me qui sou.\n"
+"\n"
+"Executeu\n"
+"\n"
+" git config --global user.email \"vós@example.com\"\n"
+" git config --global user.name \"El Vostre Nom\"\n"
+"\n"
+"per a establir la identitat predeterminat del vostre compte.\n"
+"Ometeu --global per a establir la identitat només en aquest dipòsit.\n"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -984,14 +1884,14 @@
#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
-msgstr "No es pot crear '%s.lock': %s"
+msgstr "No s'ha pogut crear '%s.lock': %s"
#: merge.c:41
msgid "failed to read the cache"
msgstr "s'ha fallat en llegir la memòria cau"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
@@ -1011,7 +1911,7 @@
#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "s'ha fallat en crear el camí '%s' %s"
+msgstr "s'ha fallat en crear el camí '%s'%s"
#: merge-recursive.c:731
#, c-format
@@ -1027,7 +1927,7 @@
msgid "refusing to lose untracked file at '%s'"
msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s '%s'"
@@ -1081,7 +1981,7 @@
#: merge-recursive.c:1143
msgid "rename"
-msgstr "canvia de nom"
+msgstr "canvi de nom"
#: merge-recursive.c:1143
msgid "renamed"
@@ -1142,11 +2042,11 @@
#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
-msgstr "L'objecte %s no és un blob"
+msgstr "l'objecte %s no és un blob"
#: merge-recursive.c:1666
msgid "modify"
-msgstr "modifica"
+msgstr "modificació"
#: merge-recursive.c:1666
msgid "modified"
@@ -1170,7 +2070,7 @@
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1736 git-submodule.sh:919
+#: merge-recursive.c:1736 git-submodule.sh:924
msgid "submodule"
msgstr "submòdul"
@@ -1221,8 +2121,8 @@
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
-msgstr[0] "s'ha trobat %u avantpassat:"
-msgstr[1] "s'han trobat %u avantpassats:"
+msgstr[0] "s'ha trobat %u avantpassat en comú:"
+msgstr[1] "s'han trobat %u avantpassats en comú:"
#: merge-recursive.c:2058
msgid "merge returned no commit"
@@ -1237,6 +2137,22 @@
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
+#: notes-merge.c:273
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
+msgstr ""
+"No heu conclòs la vostra fusió de notes prèvia (%s existeix).\n"
+"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per "
+"a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
+
+#: notes-merge.c:280
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
+
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
@@ -1291,9 +2207,9 @@
#: parse-options-cb.c:108
#, c-format
msgid "malformed object name '%s'"
-msgstr "nom de camp mal format '%s'"
+msgstr "nom d'objecte mal format '%s'"
-#: path.c:798
+#: path.c:826
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
@@ -1352,12 +2268,21 @@
msgstr ""
"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s"
-#: pathspec.c:433
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+"es faran no vàlides les cadenes buides com especificacions de camí en "
+"versions futures. si us plau, useu . en lloc d'això si volíeu coincidir amb "
+"tots els camins"
+
+#: pathspec.c:440
#, 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:442
+#: pathspec.c:449
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
@@ -1365,48 +2290,44 @@
"No hi ha res a excloure per patrons :(exclusió).\n"
"Potser heu oblidat afegir o ':/' o '.' ?"
-#: pretty.c:973
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: progress.c:235
-msgid "done"
-msgstr "fet"
-
-#: read-cache.c:1281
+#: read-cache.c:1315
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-"index.version establert, però el valor no és vàlid.\n"
+"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1291
+#: read-cache.c:1325
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-"GIT_INDEX_VERSION establert, però el valor no és vàlid.\n"
+"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: refs.c:551 builtin/merge.c:840
+#: refs.c:576 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: refs/files-backend.c:2534
+#: refs/files-backend.c:2481
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:2537
+#: refs/files-backend.c:2484
#, c-format
msgid "could not delete references: %s"
msgstr "no s'ha pogut suprimir les referències: %s"
-#: refs/files-backend.c:2546
+#: refs/files-backend.c:2493
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
@@ -1479,7 +2400,7 @@
#: ref-filter.c:244
#, c-format
msgid "malformed field name: %.*s"
-msgstr "nom d'objecte mal format: %.*s"
+msgstr "nom de camp mal format: %.*s"
#: ref-filter.c:270
#, c-format
@@ -1535,12 +2456,12 @@
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: ref-filter.c:1651
+#: ref-filter.c:1633
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:1705
+#: ref-filter.c:1687
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
@@ -1581,7 +2502,7 @@
#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "La branca font '%s' no s'emmagatzema com a branca amb seguiment remot"
+msgstr "la branca font '%s' no s'emmagatzema com a branca amb seguiment remot"
#: remote.c:1710
#, c-format
@@ -1667,37 +2588,37 @@
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
-#: revision.c:2132
+#: revision.c:2158
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla trencada"
-#: revision.c:2135
+#: revision.c:2161
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la vostra branca actual '%s' encara no té cap comissió"
-#: revision.c:2329
+#: revision.c:2355
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
-#: run-command.c:92
+#: run-command.c:106
msgid "open /dev/null failed"
msgstr "s'ha fallat en obrir /dev/null"
-#: run-command.c:94
+#: run-command.c:108
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) ha fallat"
-#: send-pack.c:298
+#: send-pack.c:297
msgid "failed to sign the push certificate"
msgstr "s'ha fallat en signar el certificat de pujada"
-#: send-pack.c:411
+#: send-pack.c:410
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:413
+#: send-pack.c:412
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1705,15 +2626,23 @@
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
-#: send-pack.c:425
+#: send-pack.c:424
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
-#: send-pack.c:430
+#: send-pack.c:429
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:174
+#: sequencer.c:171
+msgid "revert"
+msgstr "revertir"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "recollir cireres"
+
+#: sequencer.c:228
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -1721,7 +2650,7 @@
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'"
-#: sequencer.c:177
+#: sequencer.c:231
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -1731,230 +2660,257 @@
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Could not write to %s"
-msgstr "No s'ha pogut escriure a %s"
+msgid "could not lock '%s'"
+msgstr "no s'ha pogut bloquejar '%s'"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Ha hagut un error en finalitzar %s."
+msgid "could not write to '%s'"
+msgstr "no s'ha pogut escriure a '%s'"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Els vostres canvis locals se sobreescriurien pel recull de cireres."
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "no s'ha pogut escriure el terminador de línia a '%s'"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Els vostres canvis locals se sobreescriurien per la reversió."
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "s'ha fallat en finalitzar '%s'."
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "no s'ha pogut llegir '%s'"
-#: sequencer.c:228
+#: sequencer.c:305
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "els vostres canvis locals se sobreescriurien per %s."
+
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+
+#: sequencer.c:324
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: sequencer.c:399
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "No s'ha pogut resoldre la comissió HEAD\n"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "no s'ha pogut resoldre la comissió HEAD\n"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "No s'ha pogut actualitzar l'arbre cau\n"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "no s'ha pogut actualitzar l'arbre cau\n"
-#: sequencer.c:393
+#: sequencer.c:483
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "No s'ha pogut analitzar la comissió %s\n"
-
-#: sequencer.c:398
-#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "No s'ha pogut analitzar la comissió mare %s\n"
-
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "El vostre fitxer d'índex està sense fusionar."
-
-#: sequencer.c:482
-#, 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:490
-#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "La comissió %s no té mare %d"
-
-#: sequencer.c:494
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-"S'ha especificat la línia principal però la comissió %s no és una fusió."
+"teniu canvis allistats en el vostre arbre de treball\n"
+"Si aquests canvis són per a aixafar-se a la comissió prèvia, executeu:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Si són per a formar una comissió nova, executeu:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"En ambdós cassos, quan hàgiu terminat, continueu amb:\n"
+"\n"
+" git rebase --continue\n"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: sequencer.c:567
+#, c-format
+msgid "could not parse commit %s\n"
+msgstr "no s'ha pogut analitzar la comissió %s\n"
+
+#: sequencer.c:572
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "no s'ha pogut analitzar la comissió mare %s\n"
+
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "el vostre fitxer d'índex està sense fusionar."
+
+#: sequencer.c:675
+#, 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:683
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "la comissió %s no té mare %d"
+
+#: sequencer.c:687
+#, 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ó."
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió mare %s"
-#: sequencer.c:511
+#: sequencer.c:705
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "No es pot obtenir el missatge de comissió de %s"
+msgid "cannot get commit message for %s"
+msgstr "no es pot obtenir el missatge de comissió de %s"
-#: sequencer.c:597
+#: sequencer.c:797
#, c-format
msgid "could not revert %s... %s"
-msgstr "no s'ha pogut revertir %s...%s"
+msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:598
+#: sequencer.c:798
#, c-format
msgid "could not apply %s... %s"
-msgstr "no s'ha pogut aplicar %s...%s"
+msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:633
+#: sequencer.c:833
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:641
+#: sequencer.c:843
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha fallat en llegir l'índex"
-#: sequencer.c:645
+#: sequencer.c:850
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha fallat en actualitzar l'índex"
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "No es pot revertir durant una altra reversió."
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "No es pot revertir durant un recull de cireres."
-
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "No es pot recollir cireres durant una reversió."
-
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "No es pot recollir cireres durant altre recull de cireres."
-
-#: sequencer.c:732
+#: sequencer.c:944
#, c-format
-msgid "Could not parse line %d."
-msgstr "No s'ha pogut analitzar la línia %d."
+msgid "invalid line %d: %.*s"
+msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "No s'ha analitzat cap comissió."
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:749
+#: sequencer.c:966
#, c-format
-msgid "Could not open %s"
-msgstr "No s'ha pogut obrir %s"
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir '%s'."
-#: sequencer.c:753
+#: sequencer.c:972
#, c-format
-msgid "Could not read %s."
-msgstr "No s'ha pogut llegir %s."
+msgid "unusable instruction sheet: '%s'"
+msgstr "full d'instruccions inusable: '%s'"
-#: sequencer.c:760
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "no es pot recollir cireres durant una reversió."
+
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "no es pot revertir durant un recull de cireres."
+
+#: sequencer.c:1028
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Full d'instruccions inusable: %s"
+msgid "invalid key: %s"
+msgstr "clau no vàlida: %s"
-#: sequencer.c:790
+#: sequencer.c:1031
#, c-format
-msgid "Invalid key: %s"
-msgstr "Clau no vàlida: %s"
+msgid "invalid value for %s: %s"
+msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:1063
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valor no vàlid per a %s: %s"
+msgid "malformed options sheet: '%s'"
+msgstr "full d'opcions mal format: '%s'"
-#: sequencer.c:803
-#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Full d'opcions mal format: %s"
-
-#: sequencer.c:822
+#: sequencer.c:1101
msgid "a cherry-pick or revert is already in progress"
msgstr "un recull de cireres o una reversió ja està en curs"
-#: sequencer.c:823
+#: sequencer.c:1102
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:827
+#: sequencer.c:1106
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "No s'ha pogut crear el directori de seqüenciador %s"
+msgid "could not create sequencer directory '%s'"
+msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "no s'ha pogut bloquejar HEAD"
+
+#: sequencer.c:1151 sequencer.c:1289
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap recull de cireres ni cap reversió en curs"
-#: sequencer.c:864
+#: sequencer.c:1153
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:866 sequencer.c:900
+#: sequencer.c:1155 sequencer.c:1189
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:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "cannot open %s"
-msgstr "no es pot obrir %s"
+msgid "cannot open '%s'"
+msgstr "no es pot obrir '%s'"
-#: sequencer.c:888
+#: sequencer.c:1177
#, c-format
-msgid "cannot read %s: %s"
-msgstr "no es pot llegir %s: %s"
+msgid "cannot read '%s': %s"
+msgstr "no es pot llegir '%s': %s"
-#: sequencer.c:889
+#: sequencer.c:1178
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:895
+#: sequencer.c:1184
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès"
-#: sequencer.c:921
-#, c-format
-msgid "Could not format %s."
-msgstr "No s'ha pogut formatar %s."
-
-#: sequencer.c:1066
+#: sequencer.c:1354
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot recollir com a cirera un %s"
-#: sequencer.c:1069
+#: sequencer.c:1358
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió dolenta"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "No es pot revertir com a comissió inicial"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "no es pot revertir com a comissió inicial"
#: setup.c:160
#, c-format
@@ -1988,11 +2944,6 @@
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "s'ha fallat en llegir %s"
-
#: setup.c:468
#, c-format
msgid "Expected git repo version <= %d, found %d"
@@ -2005,7 +2956,7 @@
#: setup.c:762
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "No un dipòsit de git (ni cap dels directoris pares): %s"
+msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s"
#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
msgid "Cannot come back to cwd"
@@ -2036,27 +2987,63 @@
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-"Problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
+"Hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
+"(0%.3o).\n"
"El propietari dels fitxers sempre ha de tenir permissions de lectura i "
"escriptura."
-#: sha1_file.c:1046
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "el camí '%s' no existeix"
+
+#: sha1_file.c:499
+#, 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:505
+#, 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:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "el dipòsit de referència '%s' és superficial"
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "el dipòsit de referència '%s' és empeltat"
+
+#: sha1_file.c:1159
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: sha1_file.c:2434
+#: sha1_file.c:2592
#, 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:2438
+#: sha1_file.c:2596
#, 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:462
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "l'SHA1 %s curt és ambigu"
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Els candidats són:"
+
+#: sha1_name.c:578
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"
@@ -2075,7 +3062,7 @@
"\n"
" git checkout -b $br $(git rev-parse ...)\n"
"\n"
-"on \"$br\" és d'alguna manera buit i una referència de 40 caràcters\n"
+"on \"$br\" és d'alguna manera buida i una referència de 40 caràcters\n"
"hexadecimals. Si us plau, examineu aquestes referències i potser\n"
"suprimiu-les. Desactiveu aquest missatge executant\n"
"\"git config advice.objectNameWarning false\""
@@ -2103,9 +3090,9 @@
#: submodule.c:120
msgid "staging updated .gitmodules failed"
-msgstr "L'allistament del .gitmodules actualitzat ha fallat"
+msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:177
+#: submodule.c:158
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "no es permeten els valors negatius a submodule.fetchJobs"
@@ -2114,56 +3101,56 @@
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
-#: trailer.c:237
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "l'execució de l'ordre de remolc '%s' ha fallat"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut '%s' per a la clau '%s'"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
-#: trailer.c:582
+#: trailer.c:672
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "fitxa de remolc buida en el remolc '%.*s'"
-#: trailer.c:702
+#: trailer.c:695
#, c-format
msgid "could not read input file '%s'"
msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
-#: trailer.c:705
+#: trailer.c:698
msgid "could not read from stdin"
-msgstr "No s'ha pogut llegir des d'stdin"
+msgstr "no s'ha pogut llegir des d'stdin"
-#: trailer.c:857 builtin/am.c:42
+#: trailer.c:929 builtin/am.c:44
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
-#: trailer.c:859
+#: trailer.c:931
#, c-format
msgid "file %s is not a regular file"
msgstr "el fitxer %s no és un fitxer regular"
-#: trailer.c:861
+#: trailer.c:933
#, c-format
msgid "file %s is not writable by user"
msgstr "el fitxer %s no és gravable per l'usuari"
-#: trailer.c:873
+#: trailer.c:945
msgid "could not open temporary file"
msgstr "no s'ha pogut obrir el fitxer temporal"
-#: trailer.c:912
+#: trailer.c:983
#, c-format
msgid "could not rename temporary file to %s"
msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
@@ -2178,7 +3165,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida '%s'"
-#: transport.c:771
+#: transport.c:817
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -2187,7 +3174,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:775
+#: transport.c:821
#, c-format
msgid ""
"\n"
@@ -2213,15 +3200,31 @@
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:783
+#: transport.c:829
msgid "Aborting."
msgstr "S'està avortant."
-#: transport-helper.c:1041
+#: transport-helper.c:1075
#, c-format
msgid "Could not read ref %s"
msgstr "No s'ha pogut llegir la referència %s"
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objecte d'arbre massa curt"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "mode mal format en entrada d'arbre"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nom de fitxer buit en entrada de arbre"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "fitxer d'arbre massa curt"
+
#: unpack-trees.c:64
#, c-format
msgid ""
@@ -2429,7 +3432,7 @@
#: unpack-trees.c:126
#, c-format
msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
+"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
@@ -2440,7 +3443,7 @@
#: unpack-trees.c:128
#, c-format
msgid ""
-"The following Working tree files would be removed by sparse checkout "
+"The following working tree files would be removed by sparse checkout "
"update:\n"
"%s"
msgstr ""
@@ -2496,14 +3499,14 @@
msgid "could not open '%s' for reading and writing"
msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
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:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir '%s' per a lectura"
@@ -2527,414 +3530,416 @@
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
-#: wt-status.c:150
+#: wt-status.c:151
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)"
-#: wt-status.c:183
+#: wt-status.c:184
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
"resolució)"
-#: wt-status.c:187
+#: wt-status.c:188
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:198 wt-status.c:882
+#: wt-status.c:199 wt-status.c:945
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:216 wt-status.c:891
+#: wt-status.c:217 wt-status.c:954
msgid "Changes not staged for commit:"
msgstr "Canvis no allistats per a cometre:"
-#: wt-status.c:220
+#: wt-status.c:221
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:223
+#: wt-status.c:224
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
"directori de treball)"
-#: wt-status.c:225
+#: wt-status.c:226
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
-#: wt-status.c:237
+#: 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à)"
-#: wt-status.c:252
+#: wt-status.c:253
msgid "both deleted:"
msgstr "suprimit per ambdós:"
-#: wt-status.c:254
+#: wt-status.c:255
msgid "added by us:"
msgstr "afegit per nosaltres:"
-#: wt-status.c:256
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "suprimit per ells:"
-#: wt-status.c:258
+#: wt-status.c:259
msgid "added by them:"
msgstr "afegit per ells:"
-#: wt-status.c:260
+#: wt-status.c:261
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
-#: wt-status.c:262
+#: wt-status.c:263
msgid "both added:"
msgstr "afegit per ambdós:"
-#: wt-status.c:264
+#: wt-status.c:265
msgid "both modified:"
msgstr "modificat per ambdós:"
-#: wt-status.c:274
+#: wt-status.c:275
msgid "new file:"
msgstr "fitxer nou:"
-#: wt-status.c:276
+#: wt-status.c:277
msgid "copied:"
msgstr "copiat:"
-#: wt-status.c:278
+#: wt-status.c:279
msgid "deleted:"
msgstr "suprimit:"
-#: wt-status.c:280
+#: wt-status.c:281
msgid "modified:"
msgstr "modificat:"
-#: wt-status.c:282
+#: wt-status.c:283
msgid "renamed:"
msgstr "canviat de nom:"
-#: wt-status.c:284
+#: wt-status.c:285
msgid "typechange:"
msgstr "canviat de tipus:"
-#: wt-status.c:286
+#: wt-status.c:287
msgid "unknown:"
msgstr "desconegut:"
-#: wt-status.c:288
+#: wt-status.c:289
msgid "unmerged:"
msgstr "sense fusionar:"
-#: wt-status.c:370
+#: wt-status.c:371
msgid "new commits, "
msgstr "comissions noves, "
-#: wt-status.c:372
+#: wt-status.c:373
msgid "modified content, "
msgstr "contingut modificat, "
-#: wt-status.c:374
+#: wt-status.c:375
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:756
+#: wt-status.c:818
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:758
+#: wt-status.c:820
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:839
+#: wt-status.c:901
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-"No toqueu la línia de sobre.\n"
+"No toqueu la línia a dalt.\n"
"Tot el que hi ha a sota s'eliminarà."
-#: wt-status.c:950
+#: wt-status.c:1013
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:953
+#: wt-status.c:1016
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:955
+#: wt-status.c:1018
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: wt-status.c:960
+#: wt-status.c:1023
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:963
+#: wt-status.c:1026
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:973
+#: wt-status.c:1036
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:976
+#: wt-status.c:1039
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:980
+#: wt-status.c:1043
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:982
+#: wt-status.c:1045
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:984
+#: wt-status.c:1047
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
-#: wt-status.c:1109
+#: wt-status.c:1172
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1112
+#: wt-status.c:1175
#, 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:1123
+#: wt-status.c:1186
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1128
+#: wt-status.c:1191
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1131
+#: wt-status.c:1194
#, 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:1139
+#: wt-status.c:1202
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
-#: wt-status.c:1152
+#: wt-status.c:1215
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu rebasant la branca '%s' en '%s'."
-#: wt-status.c:1157
+#: wt-status.c:1220
msgid "You are currently rebasing."
msgstr "Actualment esteu rebasant."
-#: wt-status.c:1171
+#: wt-status.c:1234
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (arregleu els conflictes i després executeu \"git rebase --continue\")"
-#: wt-status.c:1173
+#: wt-status.c:1236
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)"
-#: wt-status.c:1175
+#: wt-status.c:1238
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:1181
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")"
+msgstr ""
+" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
-#: wt-status.c:1185
+#: wt-status.c:1248
#, 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:1190
+#: wt-status.c:1253
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un rebasament."
-#: wt-status.c:1193
+#: wt-status.c:1256
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:1197
+#: wt-status.c:1260
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'."
-#: wt-status.c:1202
+#: wt-status.c:1265
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un rebasament."
-#: wt-status.c:1205
+#: wt-status.c:1268
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: wt-status.c:1207
+#: wt-status.c:1270
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-" (useu \"git rebase --continue\" una vegada que esteu satisfet amb els "
+" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
"vostres canvis)"
-#: wt-status.c:1217
+#: wt-status.c:1280
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu recollint com a cirera la comissió %s."
-#: wt-status.c:1222
+#: wt-status.c:1285
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1288
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-" (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")"
+" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
+"\")"
-#: wt-status.c:1227
+#: wt-status.c:1290
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 recull de "
"cireres)"
-#: wt-status.c:1236
+#: wt-status.c:1299
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1241
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: wt-status.c:1244
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
-#: wt-status.c:1246
+#: wt-status.c:1309
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:1257
+#: wt-status.c:1320
#, 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:1261
+#: wt-status.c:1324
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1264
+#: wt-status.c:1327
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:1464
+#: wt-status.c:1524
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1470
+#: wt-status.c:1530
msgid "interactive rebase in progress; onto "
msgstr "rebasament interactiu en progrés; sobre "
-#: wt-status.c:1472
+#: wt-status.c:1532
msgid "rebase in progress; onto "
msgstr "rebasament en progrés; sobre "
-#: wt-status.c:1477
+#: wt-status.c:1537
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1479
+#: wt-status.c:1539
msgid "HEAD detached from "
msgstr "HEAD separat de "
-#: wt-status.c:1482
+#: wt-status.c:1542
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1500
+#: wt-status.c:1560
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1514
+#: wt-status.c:1574
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1516
+#: wt-status.c:1576
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1520
+#: wt-status.c:1580
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"may speed it up, but you have to be careful not to forget to add\n"
"new files yourself (see 'git help status')."
msgstr ""
-"S'ha trigat %.2f segons a enumerar fitxers no seguits.\n"
+"Ha trigat %.2f segons enumerar els fitxers no seguits.\n"
"'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n"
"oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n"
"'git help status')."
-#: wt-status.c:1526
+#: wt-status.c:1586
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1528
+#: wt-status.c:1588
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1534
+#: wt-status.c:1594
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1539
+#: wt-status.c:1599
#, 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:1542
+#: wt-status.c:1602
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1545
+#: wt-status.c:1605
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2943,55 +3948,70 @@
"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu "
"\"git add\" per a seguir-los)\n"
-#: wt-status.c:1548
+#: wt-status.c:1608
#, 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"
-#: wt-status.c:1551
+#: wt-status.c:1611
#, 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:1554 wt-status.c:1559
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1557
+#: wt-status.c:1617
#, 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:1561
+#: wt-status.c:1621
#, 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:1668
+#: wt-status.c:1728
msgid "Initial commit on "
msgstr "Comissió inicial en "
-#: wt-status.c:1672
+#: wt-status.c:1732
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1701
+#: wt-status.c:1761
msgid "gone"
msgstr "no hi és"
-#: wt-status.c:1703 wt-status.c:1711
+#: wt-status.c:1763 wt-status.c:1771
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1706 wt-status.c:1709
+#: wt-status.c:1766 wt-status.c:1769
msgid "ahead "
msgstr "davant per "
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "no es pot %s: Teniu canvis no allistats."
+
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "addicionalment, el vostre índex conté canvis sense cometre."
+
+#: wt-status.c:2278
+#, 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
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha fallat en desenllaçar '%s'"
@@ -3000,278 +4020,263 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/add.c:65
+#: builtin/add.c:80
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:71 builtin/commit.c:281
+#: builtin/add.c:85 builtin/commit.c:291
msgid "updating files failed"
msgstr "s'ha fallat en actualitzar els fitxers"
-#: builtin/add.c:81
+#: builtin/add.c:95
#, c-format
msgid "remove '%s'\n"
msgstr "elimina '%s'\n"
-#: builtin/add.c:136
+#: builtin/add.c:149
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis no allistats després d'actualitzar l'índex:"
-#: builtin/add.c:196 builtin/rev-parse.c:811
+#: builtin/add.c:209 builtin/rev-parse.c:840
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:207
+#: builtin/add.c:220
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No s'ha pogut obrir '%s' per a escriptura."
-#: builtin/add.c:211
+#: builtin/add.c:224
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:214
+#: builtin/add.c:227
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:217
+#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a '%s'"
-#: builtin/add.c:219
+#: builtin/add.c:232
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:224
+#: builtin/add.c:237
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar '%s'"
-#: builtin/add.c:234
+#: builtin/add.c:247
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:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "sigues detallat"
-
-#: builtin/add.c:256
+#: builtin/add.c:269
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:258
+#: builtin/add.c:271
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:259
+#: builtin/add.c:272
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:260
+#: builtin/add.c:273
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:261
+#: builtin/add.c:274
msgid "record only the fact that the path will be added later"
-msgstr "registra només el fet que el camí s'afegirà més tard"
+msgstr "registra només el fet de que el camí s'afegirà més tard"
-#: builtin/add.c:262
+#: builtin/add.c:275
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:265
+#: builtin/add.c:278
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
-#: builtin/add.c:267
+#: builtin/add.c:280
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:268
+#: builtin/add.c:281
msgid "just skip files which cannot be added because of errors"
msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
-#: builtin/add.c:269
+#: builtin/add.c:282
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:270 builtin/update-index.c:958
+#: builtin/add.c:283 builtin/update-index.c:947
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:270 builtin/update-index.c:959
+#: builtin/add.c:283 builtin/update-index.c:948
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
-#: builtin/add.c:292
+#: builtin/add.c:305
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Useu -f si realment els voleu afegir.\n"
-#: builtin/add.c:300
+#: builtin/add.c:312
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:336
+#: builtin/add.c:348
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mutualment incompatibles"
-#: builtin/add.c:343
+#: builtin/add.c:355
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
-#: builtin/add.c:352
+#: builtin/add.c:359
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "el paràmetre --chmod '%s' ha de ser o -x o +x"
-#: builtin/add.c:367
+#: builtin/add.c:374
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:368
+#: builtin/add.c:375
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir 'git add .'?\n"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: 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/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
+#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir '%s'"
-
-#: builtin/am.c:426
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:503
+#: builtin/am.c:491
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
-#: builtin/am.c:544 builtin/notes.c:301
+#: builtin/am.c:532
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: '%s'."
-#: builtin/am.c:581 builtin/notes.c:316
+#: builtin/am.c:569
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"
-#: builtin/am.c:607
+#: builtin/am.c:595
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:787
+#: builtin/am.c:775
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç '%s'"
-#: builtin/am.c:852
+#: builtin/am.c:840
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:899
+#: builtin/am.c:887
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:902 builtin/am.c:910
+#: builtin/am.c:890 builtin/am.c:898
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:907
+#: builtin/am.c:895
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:996
+#: builtin/am.c:984
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:1001 builtin/clone.c:380
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha fallat en crear el directori '%s'"
-#: builtin/am.c:1005
+#: builtin/am.c:993
msgid "Failed to split patches."
msgstr "S'ha fallat en dividir els pedaços."
-#: builtin/am.c:1137 builtin/commit.c:366
+#: builtin/am.c:1125 builtin/commit.c:376
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1188
+#: builtin/am.c:1176
#, 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:1189
+#: builtin/am.c:1177
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això."
-#: builtin/am.c:1190
+#: builtin/am.c:1178
#, 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:1328
+#: builtin/am.c:1316
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/am.c:1402 builtin/log.c:1543
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1417
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1602
+#: builtin/am.c:1610
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:1604
+#: builtin/am.c:1612
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:1623
+#: builtin/am.c:1631
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -3279,38 +4284,38 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1629
+#: builtin/am.c:1637
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..."
-#: builtin/am.c:1654
+#: builtin/am.c:1662
msgid "Failed to merge in the changes."
msgstr "S'ha fallat en fusionar els canvis."
-#: builtin/am.c:1679 builtin/merge.c:628
+#: builtin/am.c:1686 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1686
+#: builtin/am.c:1693
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "s'ha fallat en escriure l'objecte de comissió"
-#: builtin/am.c:1731 builtin/am.c:1735
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1751
+#: builtin/am.c:1759
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-"no es pot ser interactiu sense que stdin sigui connectat a un terminal."
+"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-#: builtin/am.c:1756
+#: builtin/am.c:1764
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -3318,47 +4323,47 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1766
+#: builtin/am.c:1774
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:1816
+#: builtin/am.c:1824
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1853 builtin/am.c:1925
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1869
+#: builtin/am.c:1877
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1877
+#: builtin/am.c:1885
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1883
+#: builtin/am.c:1891
#, 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:1928
+#: builtin/am.c:1936
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
"Cap canvi - heu oblidat d'usar 'git add'?\n"
-"Si no hi ha res a allistar, probablement alguna altra cosa\n"
-"ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç."
+"Si no hi ha res a allistar, probablement alguna altra cosa ja ha\n"
+"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1935
+#: builtin/am.c:1943
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -3366,174 +4371,153 @@
"Encara teniu camins sense fusionar en el vostre índex.\n"
"Heu oblidat d'usar 'git add'?"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 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:2095
+#: builtin/am.c:2103
msgid "failed to clean index"
msgstr "s'ha fallat en netejar l'índex"
-#: builtin/am.c:2129
+#: builtin/am.c:2137
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
-"No rebobinant a ORIG_HEAD"
+"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2192
+#: builtin/am.c:2200
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<opcions>] [(<bústia>|<directori-de-correu>)...]"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2226
+#: builtin/am.c:2234
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2232
+#: builtin/am.c:2240
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2234
+#: builtin/am.c:2242
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2236
+#: builtin/am.c:2244
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:172
msgid "be quiet"
msgstr "calla"
-#: builtin/am.c:2239
+#: builtin/am.c:2247
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:2242
+#: builtin/am.c:2250
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2244
+#: builtin/am.c:2252
msgid "pass -k flag to git-mailinfo"
msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2254
msgid "pass -b flag to git-mailinfo"
msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/am.c:2248
+#: builtin/am.c:2256
msgid "pass -m flag to git-mailinfo"
msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/am.c:2250
+#: builtin/am.c:2258
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox"
+msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox"
-#: builtin/am.c:2253
+#: builtin/am.c:2261
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:2256
+#: builtin/am.c:2264
msgid "strip everything before a scissors line"
msgstr "despulla tot abans d'una línia de tissores"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "acció"
-
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
+#: 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
msgid "pass it through git-apply"
msgstr "passa-ho a través del git-apply"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "arrel"
-
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "camí"
-
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
+#: parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "número"
-
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2282
+#: builtin/am.c:2290
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2288
+#: builtin/am.c:2296
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:2290
+#: builtin/am.c:2298
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2293
+#: builtin/am.c:2301
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2296
+#: builtin/am.c:2304
msgid "skip the current patch"
msgstr "salta el pedaç actual"
-#: builtin/am.c:2299
+#: builtin/am.c:2307
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:2303
+#: builtin/am.c:2311
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2305
+#: builtin/am.c:2313
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2308
+#: builtin/am.c:2316
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2311
+#: builtin/am.c:2319
msgid "(internal use for git-rebase)"
msgstr "(ús intern per al git-rebase)"
-#: builtin/am.c:2326
+#: builtin/am.c:2334
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."
@@ -3541,517 +4525,34 @@
"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:2333
+#: builtin/am.c:2341
msgid "failed to read the index"
msgstr "s'ha fallat en llegir l'índex"
-#: builtin/am.c:2348
+#: builtin/am.c:2356
#, 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:2372
+#: builtin/am.c:2380
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-"Directori %s extraviat trobat.\n"
+"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2378
+#: builtin/am.c:2386
msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Operació de resolució no en curs; no reprenem."
+msgstr "Una operació de resolució no està en curs; no reprenem."
-#: builtin/apply.c:122
+#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "opció d'espai en blanc '%s' no reconeguda"
-
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
-
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec ha retornat %d per l'entrada: %s"
-
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
-
-#: builtin/apply.c:984
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
-"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
-
-#: builtin/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
-
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr ""
-"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
-
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
-
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recompte: línia inesperada: %.*s"
-
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-
-#: builtin/apply.c:1567
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
-"%d component de nom de camí inicial (línia %d)"
-msgstr[1] ""
-"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
-"%d components de nom de camí inicial (línia %d)"
-
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "el fitxer nou depèn dels continguts antics"
-
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "el fitxer suprimit encara té continguts"
-
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "el pedaç és malmès a la línia %d"
-
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "el fitxer nou %s depèn dels continguts antics"
-
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "el fitxer suprimit %s encara té continguts"
-
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
-
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "pedaç binari malmès a la línia %d: %.*s"
-
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "pedaç binari no reconegut a la línia %d"
-
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "pedaç amb només escombraries a la línia %d"
-
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "no s'ha pogut obrir o llegir %s"
-
-#: builtin/apply.c:2901
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "inici de línia no vàlid: '%c'"
-
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)."
-msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)."
-
-#: builtin/apply.c:3032
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"tot cercant:\n"
-"%.*s"
-
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "manquen les dades de pedaç binari de '%s'"
-
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "el pedaç binari no s'aplica a '%s'"
-
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
-
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "el pedaç ha fallat: %s:%ld"
-
-#: builtin/apply.c:3314
-#, c-format
-msgid "cannot checkout %s"
-msgstr "no es pot agafar %s"
-
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
-
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: no existeix en l'índex"
-
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: builtin/apply.c:3491 builtin/apply.c:3652
-#, c-format
-msgid "%s: does not match index"
-msgstr "%s: no coincideix amb l'índex"
-
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-
-#: builtin/apply.c:3669
-#, c-format
-msgid "%s: wrong type"
-msgstr "%s: tipus erroni"
-
-#: builtin/apply.c:3671
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s és del tipus %o, s'esperava %o"
-
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "camí no vàlid: %s"
-
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: ja existeix en l'índex"
-
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: ja existeix en el directori de treball"
-
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
-
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: el pedaç no s'aplica"
-
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "S'està comprovant el pedaç %s..."
-
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camí '%s'"
-
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "no s'ha pogut eliminar %s de l'índex"
-
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "pedaç malmès per al submòdul %s"
-
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
-
-#: builtin/apply.c:4224
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr ""
-"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
-"%s"
-
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "s'està tancant el fitxer '%s'"
-
-#: builtin/apply.c:4313
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
-
-#: builtin/apply.c:4403
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "El pedaç %s s'ha aplicat netament."
-
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "error intern"
-
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
-msgstr[1] "S'està aplicant el pedaç %%s amb %d rebuitjos..."
-
-#: builtin/apply.c:4424
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "no es pot obrir %s: %s"
-
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "El tros #%d s'ha aplicat netament."
-
-#: builtin/apply.c:4448
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr "S'ha rebutjat el tros #%d."
-
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "S'ha saltat el pedaç '%s'."
-
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "entrada no reconeguda"
-
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "no es pot llegir el fitxer d'índex"
-
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way fora d'un dipòsit"
-
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index fora d'un dipòsit"
-
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached fora d'un dipòsit"
-
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "no es pot obrir el pedaç '%s'"
-
-#: builtin/apply.c:4760
-#, 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"
-
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, 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."
-
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "aplica els canvis que coincideixin amb el camí donat"
-
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-"elimina <nombre> barres obliqües inicials dels camins de diferència "
-"tradicionals"
-
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ignora afegiments fets pel pedaç"
-
-#: builtin/apply.c:4811
-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"
-
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-
-#: builtin/apply.c:4817
-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"
-
-#: builtin/apply.c:4819
-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"
-
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "aplica un pedaç sense tocar l'arbre de treball"
-
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "els camins se separen amb el caràcter NUL"
-
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "assegura't que almenys <n> línies de context coincideixin"
-
-#: builtin/apply.c:4838
-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"
-
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ignora els canvis d'espai en blanc en cercar context"
-
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "aplica el pedaç al revés"
-
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "no esperis almenys una línia de context"
-
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"
-
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "permet trossos encavalcants"
-
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-
-#: builtin/apply.c:4859
-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"
-
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "anteposa <arrel> a tots els noms de fitxer"
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -4111,118 +4612,172 @@
msgid "Blaming lines"
msgstr "S'estan culpant les línies"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
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:2538
+#: builtin/blame.c:2579
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:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades de culpa"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
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:2546
+#: builtin/blame.c:2587
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:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
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:2550
+#: builtin/blame.c:2591
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:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"Usa un heurístic experimental basat en sagnat per a millorar les diferències"
+
+#: builtin/blame.c:2600
+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 "
+"diferències"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
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:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
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:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
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:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"no es pot usar --progress amb els formats --incremental o de porcellana"
+
#. TRANSLATORS: This string is used to tell us the maximum
#. display width for a relative timestamp in "git blame"
#. output. For C locale, "4 years, 11 months ago", which
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents i --reverse no es jutgen bé."
+
+#: builtin/blame.c:2800
+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:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse i --first-parent-together requereixen una última comissió "
+"especificada"
+
+#: builtin/blame.c:2832
+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:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "no hi ha tal camí %s en %s"
+
+#: builtin/blame.c:2854
+#, 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:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "el fitxer %s té només %lu línia"
+msgstr[1] "el fitxer %s té només %lu línies"
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
@@ -4474,6 +5029,10 @@
msgid "change the upstream info"
msgstr "canvia la informació de font"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Desestableix la informació de font"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "usa sortida colorada"
@@ -4546,8 +5105,8 @@
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 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:369
msgid "object"
msgstr "objecte"
@@ -4560,7 +5119,7 @@
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
@@ -4671,65 +5230,82 @@
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<tipus>|--textconv) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+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:923
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "usa un camí especìfic per a --textconv/--filters"
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
@@ -4749,7 +5325,7 @@
msgid "use .gitattributes only from the index"
msgstr "usa .gitattributes només des de l'índex"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "llegeix els noms de fitxer d'stdin"
@@ -4757,7 +5333,7 @@
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:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "omet el reportatge de progrés"
@@ -4847,9 +5423,9 @@
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "cadena"
@@ -4897,7 +5473,7 @@
#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
-msgstr "no s'ha pogut afegir el resultat de fusió per a '%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
@@ -4921,54 +5497,54 @@
msgid "path '%s' is unmerged"
msgstr "el camí '%s' està sense fusionar"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
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:624
#, 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:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha agafat i restablert la branca '%s'\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha agafat la branca nova '%s'\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha agafat la branca '%s'\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4991,7 +5567,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5018,150 +5594,150 @@
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de nàixer"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, 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:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevulla modificació local)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
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:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -5170,12 +5746,12 @@
"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:1265
+#: builtin/checkout.c:1264
#, 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:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5327,8 +5903,8 @@
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "patró"
@@ -5368,112 +5944,129 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit reflectit (implica bare)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "directori del qual les plantilles s'usaran"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc del HEAD del remot"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "hora"
+
+#: builtin/clone.c:100
+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
+msgid "revision"
+msgstr "revisió"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "aprofundeix la història d'un clon superficial excloent una revisió"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 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:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "usa només les adreces IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "usa només les adreces IPv6"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -5481,58 +6074,42 @@
"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:307
+#: builtin/clone.c:303
#, 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."
+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:309
-#, 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."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència '%s' és superficial"
-
-#: builtin/clone.c:317
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència '%s' és empeltat"
-
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha fallat en obrir '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha fallat en fer stat a '%s'\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha fallat en crear l'enllaç '%s'"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha fallat en copiar el fitxer a '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -5543,123 +6120,141 @@
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, 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:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
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:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, 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:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a '%s'...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive no és compatible amb ambdòs --reference i --reference-if-"
+"able"
+
+#: builtin/clone.c:1019
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:1000
+#: builtin/clone.c:1021
+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
+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
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, 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:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -5801,66 +6396,66 @@
"Llavors \"git cherry-pick --continue\" reprendrà recollint\n"
"com a cireres les comissions restants.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un recull de cireres."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió '%s' li manca la capçalera d'autor"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió '%s' té una línia d'autor mal formada"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5868,38 +6463,38 @@
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, 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"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5914,7 +6509,7 @@
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5929,7 +6524,7 @@
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5939,7 +6534,7 @@
"S'ignoraran les línies començant amb '%c', i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5950,150 +6545,154 @@
"Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n"
"mateix si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid '%s'"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambdós --reset-author i --author no té sentit"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author només es pot usar amb -C, -c o --amend."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"S'han especificat camins explícits sense -i o -o; s'està presumint camins --"
"only..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "versió"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -6101,202 +6700,202 @@
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "
"especificada"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "
"especificada"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
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:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "com despullar els espais i #comentaris del missatge"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els ganxos de precomissió i missatge de comissió"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de postreescriure"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6466,17 +7065,26 @@
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració '%s'"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"no es pot sobreescriure múltiples valors amb un sol valor\n"
+" Useu una expresió regular, --add o --replace-all per a canviar %s."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
#: builtin/describe.c:17
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [opcions] [<comissió>...]"
+msgstr "git describe [<opcions>] [<comissió>...]"
#: builtin/describe.c:18
msgid "git describe [<options>] --dirty"
@@ -6590,7 +7198,7 @@
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a retrocediment"
@@ -6624,21 +7232,21 @@
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid '%s'."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: '%s"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat '%s'."
@@ -6711,162 +7319,166 @@
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "aprofundeix la història d'un clon superficial basat en temps"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "directori"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "mode de recursivitat per defecte"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, 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:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, 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:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6876,55 +7488,55 @@
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevulla branca antiga o conflictiva"
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, 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:979
+#: builtin/fetch.c:998
#, 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:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6932,32 +7544,40 @@
"Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "No s'admet una profunditat negativa en --deepen"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen i --depth són mutualment exclusius"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
@@ -6967,23 +7587,23 @@
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (desaprovat)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "fitxer del qual llegir"
@@ -7101,7 +7721,7 @@
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
@@ -7195,228 +7815,223 @@
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:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, 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:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció `%c' espera un valor numèric"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "no es pot obrir '%s'"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
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:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
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:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
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:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
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:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "usa <n> fils obrers"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
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:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
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:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
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:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index o --untracked no es pot usar amb revisions."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
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:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
@@ -7432,85 +8047,89 @@
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "tipus"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "tipus d'objecte"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "escriu l'objecte a la base de dades d'objectes"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "llegeix l'objecte des d'stdin"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "emmagatzema el fitxer tal com és sense filtres"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"només suma qualsevulla brossa aleatòria per a crear objectes malmesos per a "
"depurar al Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "processa el fitxer com si fos d'aquest camí"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "imprimeix totes les ordres disponibles"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "exclou guíes"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "imprimeix la llista de guies útils"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "mostra la pàgina de manual"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "mostra la pàgina de manual en el navegador web"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "mostra la pàgina d'informació"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut '%s'"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "S'ha fallat en iniciar emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "S'ha fallat en analitzar la versió d'emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha fallat en executar '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -7519,7 +8138,7 @@
"'%s': camí a un visualitzador de manuals no compatible.\n"
"Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -7528,155 +8147,159 @@
"'%s': ordre per a un visualitzador de manuals compatible.\n"
"Si us plau, considereu usar 'man.<eina>.path' en lloc d'això."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualitzador de manuals desconegut."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "ús: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' és un àlies de `%s'"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "ús: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: tipus %s esperat, %s trobat"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
msgstr[1] "no es pot omplir %d octets"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr "paquet massa gran per a la definició actual d'off_t"
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "el paquet supera la mida màxima permesa"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
-msgstr "no es pot crear '%s'"
+msgstr "no s'ha pogut crear '%s'"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet '%s'"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, 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:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "desbordament de valor de desplaçament per a l'objecte base de delta"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de delta està fora de límits"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -7684,144 +8307,144 @@
msgstr[1] ""
"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Error en objecte"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "s'ha fallat en aplicar la delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "S'estan resolent les deltes"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, 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:1267
+#: builtin/index-pack.c:1268
#, 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:1271
+#: builtin/index-pack.c:1272
#, 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"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "error en tancar el fitxer de paquet"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "no es pot escriure el fitxer a retenir '%s'"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer de paquet"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> dolent"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
@@ -7861,95 +8484,95 @@
msgid "bad %s"
msgstr "%s dolent"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en '%s'"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "no es pot fer stat en la plantilla '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "no es pot fer opendir en el directori '%s'"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "no es pot fer readlink en '%s'"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no es pot fer symlink en '%s' '%s'"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "no es pot copiar '%s' a '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "s'està ignorant la plantilla %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "no s'han trobat les plantilles %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "no s'està copiant plantilles de '%s': %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s ja existeix"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s ja existeix"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7957,25 +8580,25 @@
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7984,7 +8607,7 @@
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball '%s'"
@@ -8095,37 +8718,34 @@
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha fallat en resoldre '%s' com a referència vàlida."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
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"
@@ -8136,211 +8756,215 @@
"seguir una branca remot. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "S'ha fallat en trobar la base exacta de fusió."
-#: builtin/log.c:1294
+#: builtin/log.c:1298
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:1298
+#: builtin/log.c:1302
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:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
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:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
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:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
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:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
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:1438
+#: builtin/log.c:1445
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:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
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:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
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:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix i -k són mutualment exclusius."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -8348,101 +8972,105 @@
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
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:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts allistats"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
-msgstr "mostra els terminis de línia dels fitxers"
+msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "salta els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
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:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "recursa als submòduls"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta això com a error"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "mostra les dades de depuració"
@@ -8561,33 +9189,33 @@
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 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:198 builtin/pull.c:129
+#: builtin/merge.c:198 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:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 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:204 builtin/pull.c:138
+#: builtin/merge.c:204 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:206 builtin/pull.c:141
+#: builtin/merge.c:206 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:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
@@ -8595,28 +9223,28 @@
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 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:215 builtin/pull.c:153
+#: builtin/merge.c:215 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:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
@@ -8628,7 +9256,7 @@
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
@@ -8851,55 +9479,55 @@
msgid "Already up-to-date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, 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:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, 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:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8926,23 +9554,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "emet tots els avantpassats comuns"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "troba els avantpassats per a una sola fusió d'n vies"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "llista les revisions no abastables d'altres"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "és la primera un avantpassat de l'altre?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
@@ -8987,6 +9615,37 @@
msgid "set labels for file1/orig-file/file2"
msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "opció desconeguda %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no s'ha pogut analitzar l'objecte '%s'"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s."
+msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "no s'està gestionant res a part de la fusió de dos caps."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no s'ha pogut resoldre la referència '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "S'està fusionant %s amb %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -9097,43 +9756,43 @@
msgid "renaming '%s' failed"
msgstr "el canvi del nom de '%s' ha fallat"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "llegeix d'stdin"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
@@ -9269,9 +9928,9 @@
msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-"Si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
+"si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
"l'opció -F"
#: builtin/notes.c:203
@@ -9280,8 +9939,8 @@
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Els continguts de la nota s'han deixat en %s"
+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:439
#, c-format
@@ -9293,52 +9952,76 @@
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
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "s'ha fallat en resoldre '%s' com a referència vàlida."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "S'ha fallat en llegir l'objecte '%s'."
+msgid "failed to read object '%s'."
+msgstr "s'ha fallat en llegir l'objecte '%s'."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "No es pot llegir les dades de node de l'objecte no de blob '%s'."
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'."
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "línia d'entrada mal formada: '%s'."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "s'ha fallat en copiar les notes de '%s' a '%s'"
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, c-format
+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
msgid "too many parameters"
msgstr "massa paràmetres"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "No s'ha trobat cap nota per a l'objecte %s."
+msgid "no note found for object %s."
+msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9347,30 +10030,30 @@
"No es pot afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "llegeix els objectes des d'stdin"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9379,12 +10062,12 @@
"No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Manquen notes a l'objecte font %s. No es pot copiar."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -9393,20 +10076,52 @@
"S'han desaprovat 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:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "s'ha fallat en eliminar l'arbre de treball de 'git notes merge'"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "s'ha fallat en llegir la referència NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+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
+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
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "s'ha fallat en resoldre NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "s'ha fallat en finalitzar la fusió de notes"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -9414,48 +10129,48 @@
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "Cal especificar una referència de notes a fusionar"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, 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:861
-#, c-format
-msgid "Failed to store link to current notes ref (%s)"
-msgstr ""
-"S'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)"
+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
#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+"s'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)"
+
+#: builtin/notes.c:865
+#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
@@ -9465,239 +10180,235 @@
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Subordre desconeguda: %s"
+msgid "unknown subcommand: %s"
+msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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:781
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
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:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "S'estan comprimint objectes"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex dolenta '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
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:2652
+#: builtin/pack-objects.c:2800
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:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "versió[,desplaçament]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
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:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer de paquet de sortida"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr ""
"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
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:2667
+#: builtin/pack-objects.c:2815
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"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "reusa les deltes existents"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de delta"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
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:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevulla referència"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
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:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
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:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "hora"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
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:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
@@ -9737,53 +10448,45 @@
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un dipòsit d'objectes preciosos"
-#: builtin/pull.c:72
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [opcions] [<dipòsit> [<especificació-de-referència>...]]"
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valor no vàlid per a %s: %s"
-#: builtin/pull.c:120
+#: builtin/pull.c:73
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
+
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis per rebasar en lloc de fusionar"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "automàticament emmagatzema/desempila abans i després de rebasament"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "No es pot baixar amb rebasament: Teniu canvis no allistats."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No es pot baixar amb rebasament: El vostre índex conté canvis sense cometre."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9791,13 +10494,13 @@
"No hi ha cap candidat sobre el qual rebasar entre les referències que acabeu "
"d'obtenir."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9805,7 +10508,7 @@
"Generalment això vol dir que heu proveït una especificació de\n"
"referència de comodí que no tenia cap coincidència en el costat remot."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9816,44 +10519,44 @@
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Si us plau, especifiqueu sobre què branca voleu rebasar."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Si us plau, especifiqueu amb què branca voleu fusionar."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
"amb:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9862,20 +10565,28 @@
"La vostra configuració especifica fusionar amb la referència '%s'\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures per a rebasar"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "baixar amb rebasament"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "si us plau, cometeu-los o emmagatzemeu-los."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9886,7 +10597,7 @@
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9904,11 +10615,11 @@
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "No es pot fusionar múltiples branques a un cap buit."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot rebasar sobre múltiples branques."
@@ -10286,15 +10997,68 @@
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set 'receive.denyCurrentBranch' configuration variable to\n"
+"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"Per defecte, es denega actualizar la branca actual en un dipòsit no\n"
+"nu, perquè feria l'índex i l'arbre de treball inconsistents amb el\n"
+"que hàgiu pujat, i requerria 'git reset --hard' per a fer que\n"
+"l'arbre de treball coincideixi amb HEAD.\n"
+"\n"
+"Podeu establir la variable de configuració\n"
+"'receive.denyCurrentBranch' a 'ignore' o 'warn' en el dipòsit remot\n"
+"per a permetre pujar a la seva branca actual; no obstant, no es\n"
+"recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
+"alguna altra manera per a coincidar amb el que hàgiu pujat.\n"
+"\n"
+"Per a silenciar aquest missatge i encara retenir el comportament\n"
+"predeterminat, establiu la variable de configuració\n"
+"'receive.denyCurrentBranch' a 'refuse'."
+
+#: builtin/receive-pack.c:813
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"Per defecte, es denega suprimir la branca actual, perquè el\n"
+"'git clone' següent no resultarà en cap fitxer agafat, causant\n"
+"confusió.\n"
+"\n"
+"Podeu establir la variable de configuració\n"
+"'receive.denyDeleteCurrent' a 'warn' o 'ignore' en el dipòsit remot\n"
+"per a permetre suprimir la branca actual, amb o sense un missatge\n"
+"d'advertència.\n"
+"\n"
+"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "callat"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
@@ -10628,7 +11392,7 @@
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(sense URL)"
@@ -10666,7 +11430,7 @@
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (estat no consultat)"
@@ -10680,140 +11444,145 @@
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
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:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
-msgstr "consulta els URL de pujada en lloc dels URL d'obteniment"
+msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot '%s'"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
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
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Subordre desconeguda: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
@@ -11002,8 +11771,8 @@
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
#: builtin/reset.c:27
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <arbre> [--] <camins>..."
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<arbre>] [--] <camins>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
@@ -11123,27 +11892,27 @@
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "retén el `--` passat com a paràmetre"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
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:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -11235,7 +12004,7 @@
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "el recull de cireres ha fallat"
@@ -11406,70 +12175,125 @@
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:640
+#: builtin/show-branch.c:375
+#, 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
+#, c-format
+msgid "no matching refs with %s"
+msgstr "no hi ha referències coincidents amb %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "omet l'anomenament de cadenes"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevulla altra referència"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
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
+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
+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
+msgid "--reflog option needs one branch name"
+msgstr "l'opció --reflog necessita un nom de branca"
+
+#: builtin/show-branch.c:733
+#, 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
+#, c-format
+msgid "no such ref %s"
+msgstr "no hi ha tal referència %s"
+
+#: builtin/show-branch.c:829
+#, 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
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' no és una referència vàlida."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "no es pot trobar la comissió %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -11533,12 +12357,12 @@
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:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
@@ -11548,77 +12372,96 @@
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, 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:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha fallat en registrar l'url per al camí de submòdul '%s'"
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha fallat en registrar el mode d'actualització per al camí de submòdul '%s'"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "el submòdul '%s' no pot afegir un alternatiu: %s"
+
+#: builtin/submodule--helper.c:563
+#, 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:570
+#, 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:593
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "força el progrés del clonatge"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -11626,97 +12469,97 @@
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori '%s'"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, 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:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "no es pot obrir el fitxer '%s'"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "no s'ha pogut tancar el fitxer %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, 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:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul '%s' no està inicialitzat"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està saltant el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està saltant el submòdul '%s'"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha fallat en clonar '%s'. S'ha programat un reintent"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha fallat una segona vegada en clonar '%s', s'està avortant"
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
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:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
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:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
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:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "valor dolent per al paràmetre update"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -11725,11 +12568,11 @@
"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:977
+#: builtin/submodule--helper.c:1100
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:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no és una subordre vàlida de submodule--helper"
@@ -11966,7 +12809,7 @@
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualitzada (era %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "S'estan desempaquetant els objectes"
@@ -12035,136 +12878,152 @@
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora l'ajust assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
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:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
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:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les etapes #2 i #3 per als camins llistats"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
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:1014
+#: builtin/update-index.c:1003
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:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache està establert a veritable; elimineu-lo o canvieu-lo, si "
+"realment voleu inhabilitar el cau no seguit"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
+"realment voleu habilitar el cau no seguit"
+
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a '%s'"
@@ -12364,27 +13223,41 @@
msgid "only useful for debugging"
msgstr "només útil per a la depuració"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després del anunci inicial de referència"
-#: upload-pack.c:841
+#: upload-pack.c:1032
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:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Els permisos en el vostre directori de sòcol són massa liberals;\n"
+"potser que altres usuaris poden llegir els vostres credencials.\n"
+"Considereu executar:\n"
+"\n"
+"\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
@@ -12400,7 +13273,11 @@
"'git help <concepte>' per a llegir sobre una subordre o concepte\n"
"específic."
-#: http.c:323
+#: http.c:342
+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:351
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"
@@ -12519,15 +13396,15 @@
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "sigues més callat"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
@@ -12747,7 +13624,7 @@
msgstr "La fusió automàtica no ha funcionat."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "No s'ha de fer un pop."
#: git-merge-octopus.sh:73
@@ -12938,6 +13815,10 @@
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "No es pot desar els fitxers no seguits"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
@@ -12978,6 +13859,10 @@
"error: opció desconeguda de 'stash save': $option\n"
" Per a proveir un missatge, useu git stash save -- '$option'"
+#: git-stash.sh:251
+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
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
@@ -12999,98 +13884,102 @@
msgid "Cannot remove worktree changes"
msgstr "No es pot eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "No s'ha trobat cap magatzem."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:478
+#: git-stash.sh:489
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:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:522
+#: git-stash.sh:508
+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
msgid "Cannot unstage modified files"
msgstr "No es pot desallistar fitxers modificats"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:551
+#: git-stash.sh:562
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:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -13101,23 +13990,23 @@
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -13134,49 +14023,49 @@
"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
"name'."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"S'està reactivant el directori de git local per al submòdul '$sm_name'."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "no s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha fallat en afegir el submòdul '$sm_path'"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha fallat en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "S'està entrant '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, 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:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "--pathspec i --all són incompatibles"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, 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:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -13185,7 +14074,7 @@
"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:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -13194,38 +14083,38 @@
"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
"useu '-f' per a descartar-les"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "S'ha netejat el directori '$displaypath'"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, 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:454
+#: git-submodule.sh:455
#, 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:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, 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:622
+#: git-submodule.sh:627
#, 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:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -13234,101 +14123,97 @@
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, 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:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
-"L'obteniment directe d'aquella comissió ha fallat."
+"L'obtenció directa d'aquella comissió ha fallat."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, 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:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "no s'ha pogut rebasar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha rebasat en '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, 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:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, 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:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "S'ha fallat en recursar al camí de submòdul '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
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:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, 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:890
+#: git-submodule.sh:895
#, 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:893
+#: git-submodule.sh:898
#, 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:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "S'ha fallat en recursar al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
@@ -13338,12 +14223,12 @@
msgid "See git-${cmd}(1) for details."
msgstr "Vegeu git-${cmd}(1) per detalls."
-#: git-rebase--interactive.sh:131
+#: git-rebase--interactive.sh:140
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "S'està rebasant ($new_count/$total)"
-#: git-rebase--interactive.sh:147
+#: git-rebase--interactive.sh:156
msgid ""
"\n"
"Commands:\n"
@@ -13371,7 +14256,7 @@
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-#: git-rebase--interactive.sh:162
+#: git-rebase--interactive.sh:171
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -13380,7 +14265,7 @@
"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una "
"comissió.\n"
-#: git-rebase--interactive.sh:166
+#: git-rebase--interactive.sh:175
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -13388,7 +14273,7 @@
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-#: git-rebase--interactive.sh:202
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -13407,87 +14292,87 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:227
+#: git-rebase--interactive.sh:236
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no és una comissió que es pugi escollir"
-#: git-rebase--interactive.sh:266
+#: git-rebase--interactive.sh:275
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de comissió no vàlid: $sha1"
-#: git-rebase--interactive.sh:308
+#: git-rebase--interactive.sh:317
msgid "Cannot write current commit's replacement sha1"
msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-#: git-rebase--interactive.sh:360
+#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avanç ràpid a $sha1"
-#: git-rebase--interactive.sh:362
+#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No es pot avançar ràpidament a $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:380
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No es pot moure HEAD a $first_parent"
-#: git-rebase--interactive.sh:376
+#: git-rebase--interactive.sh:385
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant aixafar una fusió: $sha1"
-#: git-rebase--interactive.sh:390
+#: git-rebase--interactive.sh:399
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
-#: git-rebase--interactive.sh:398
+#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:416
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
-#: git-rebase--interactive.sh:412
+#: git-rebase--interactive.sh:421
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} se saltarà:"
-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:432
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Això és una combinació de $count comissió."
msgstr[1] "Això és una combinació de $count comissions."
-#: git-rebase--interactive.sh:431
+#: git-rebase--interactive.sh:440
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
-#: git-rebase--interactive.sh:434
+#: git-rebase--interactive.sh:443
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
-#: git-rebase--interactive.sh:435
+#: git-rebase--interactive.sh:444
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1er missatge de comissió:"
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
+#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
+#: git-rebase--interactive.sh:530
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No s'ha pogut aplicar $sha1... $rest"
-#: git-rebase--interactive.sh:549
+#: git-rebase--interactive.sh:558
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -13503,31 +14388,31 @@
"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
"comissió."
-#: git-rebase--interactive.sh:564
+#: git-rebase--interactive.sh:573
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:579
+#: git-rebase--interactive.sh:588
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No es pot '$squash_style' sense una comissió prèvia"
-#: git-rebase--interactive.sh:621
+#: git-rebase--interactive.sh:630
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
-#: git-rebase--interactive.sh:629
+#: git-rebase--interactive.sh:638
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:640
msgid "and made changes to the index and/or the working tree"
msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-#: git-rebase--interactive.sh:633
+#: git-rebase--interactive.sh:642
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -13538,7 +14423,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
+#: git-rebase--interactive.sh:655
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -13553,25 +14438,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:666
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
-#: git-rebase--interactive.sh:658
+#: git-rebase--interactive.sh:667
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:693
+#: git-rebase--interactive.sh:702
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha rebasat i actualitzat $head_name amb èxit."
-#: git-rebase--interactive.sh:740
+#: git-rebase--interactive.sh:749
msgid "Could not skip unnecessary pick commands"
msgstr "No s'ha pogut saltar ordres innecessaris d'elecció"
-#: git-rebase--interactive.sh:898
+#: git-rebase--interactive.sh:907
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
@@ -13580,7 +14465,7 @@
"Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n"
" - $line"
-#: git-rebase--interactive.sh:931
+#: git-rebase--interactive.sh:940
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
@@ -13589,11 +14474,11 @@
"Advertència: no es reconeix l'ordre en la línia següent:\n"
" - $line"
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:979
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:1017
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
@@ -13602,7 +14487,7 @@
"accidentalment.\n"
"Les comissions descartades (més nova a més vella):"
-#: git-rebase--interactive.sh:1016
+#: git-rebase--interactive.sh:1025
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
@@ -13617,7 +14502,7 @@
"d'advertències.\n"
"Els comportaments possibles són: ignore, warn, error."
-#: git-rebase--interactive.sh:1027
+#: git-rebase--interactive.sh:1036
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
@@ -13626,19 +14511,23 @@
"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
"missingCommitsCheck. S'està ignorant."
-#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Podeu arreglar això amb 'git rebase --edit-todo'."
+#: git-rebase--interactive.sh:1053
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Podeu arreglar això amb 'git rebase --edit-todo' i desprès 'git rebase --"
+"continue'."
-#: git-rebase--interactive.sh:1045
+#: git-rebase--interactive.sh:1054
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:1069
+#: git-rebase--interactive.sh:1078
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1074
+#: git-rebase--interactive.sh:1083
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -13651,7 +14540,7 @@
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
@@ -13669,13 +14558,13 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1091
+#: git-rebase--interactive.sh:1100
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Ha hagut un error en intentar trobar la identitat d'autor per a esmenar la "
"comissió"
-#: git-rebase--interactive.sh:1096
+#: git-rebase--interactive.sh:1105
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -13683,11 +14572,11 @@
"Teniu canvis no comessos 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:1101 git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
msgid "Could not commit staged changes."
msgstr "No s'ha pogut cometre els canvis emmagatzemats."
-#: git-rebase--interactive.sh:1129
+#: git-rebase--interactive.sh:1138
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -13696,50 +14585,45 @@
"\n"
msgstr ""
"\n"
-"Esteu editant el fitxer de cosses a fer d'un rebasament interactiu en "
-"marxa.\n"
+"Esteu editant el fitxer de coses a fer d'un rebasament interactiu en marxa.\n"
"Per a continuar el rebasament després d'editar, executeu:\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Heu de primer establir la vostra informació de cometent"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1159
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1164
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1165
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1167
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
msgid "Could not init rewritten commits"
msgstr "No s'ha pogut iniciar les comissions reescrites"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1282
#, 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:1281
+#: git-rebase--interactive.sh:1287
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -13749,7 +14633,7 @@
"No obstant, si elimineu tot, s'avortarà el rebasament.\n"
"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1294
msgid "Note that empty commits are commented out"
msgstr "Nota que les comissions buides estan comentades"
@@ -13778,6 +14662,10 @@
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es pot reescriure branques: Teniu canvis no allistats."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "No es pot baixar amb rebasament: Teniu canvis no allistats."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
@@ -13787,15 +14675,24 @@
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "No es pot rebasar: 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 amb rebasament: El vostre índex conté canvis sense cometre."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball"
+"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
#: git-sh-setup.sh:377
msgid "Unable to determine absolute path of git directory"
diff --git a/po/ru.po b/po/ru.po
index 760f7ab..a92ddcf 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-10-16 17:25+0000\n"
+"POT-Creation-Date: 2016-11-25 22:50+0800\n"
+"PO-Revision-Date: 2016-11-28 23:58+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -88,6 +88,620 @@
"\n"
msgstr "ΠΡΠΈΠΌΠ΅ΡΠ°Π½ΠΈΠ΅: ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ Π½Π° «%s».\n\nΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΡΠΎΡΡΠΎΡΠ½ΠΈΠΈ «ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΠΎΠ³ΠΎ HEAD». ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΎΡΠΌΠΎΡΡΠ΅ΡΡΡΡ, ΡΠ΄Π΅Π»Π°ΡΡ\nΡΠΊΡΠΏΠ΅ΡΠΈΠΌΠ΅Π½ΡΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΈΡ
, ΡΠ°ΠΊΠΆΠ΅ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ\nΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π»ΡΠ±ΡΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΡΡΠΎΠΌ ΡΠΎΡΡΠΎΡΠ½ΠΈΠΈ Π½Π΅ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Ρ Π»ΡΠ±ΡΠ΅ Π²Π΅ΡΠΊΠΈ ΠΈ\nΠ½Π΅ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄Ρ Π½Π° Π½ΠΈΡ
.\n\nΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ²ΠΎΠΈ ΠΊΠΎΠΌΠΌΠΈΡΡ, ΡΠΎ Π²Ρ\nΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ (ΡΠ΅ΠΉΡΠ°Ρ ΠΈΠ»ΠΈ ΠΏΠΎΠ·ΠΆΠ΅) Π²ΡΠ·Π²Π°Π² ΠΊΠΎΠΌΠ°Π½Π΄Ρ checkout ΡΠ½ΠΎΠ²Π°,\nΠ½ΠΎ Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠΌ -b. ΠΠ°ΠΏΡΠΈΠΌΠ΅Ρ:\n\n git checkout -b <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ>\n\n"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² «%s»"
+
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² «%s»"
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject ΠΈ --3way Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached ΠΈ --3way Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
+
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΈΡΡ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΎΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΌΠ΅ΡΠΊΠΈ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ %s"
+
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΠ» %d Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°: %s"
+
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² ΡΡΡΠΎΠΊΠ΅ ΠΏΠ°ΡΡΠ° %d"
+
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ Π½ΠΎΠ²ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ ΡΡΠ°ΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: Π½Π΅ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ°: %.*s"
+
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "ΡΡΠ°Π³ΠΌΠ΅Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π΅Π· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s"
+
+#: apply.c:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname"
+" component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname"
+" components (line %d)"
+msgstr[0] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½ΡΠ° ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
+msgstr[1] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
+msgstr[2] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
+msgstr[3] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
+
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° (ΡΡΡΠΎΠΊΠ° %d)"
+
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ"
+
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅"
+
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "ΠΏΠ°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» %s Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ"
+
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» %s Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅"
+
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠ°ΠΉΠ» %s ΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡ ΠΏΡΡΡΡΠΌ, Π½ΠΎ Π½Π΅ ΡΠ΄Π°Π»ΡΠ΅ΡΡΡ"
+
+#: apply.c:1984
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s"
+
+#: apply.c:2021
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "ΠΏΠ°ΡΡ Ρ ΠΌΡΡΠΎΡΠΎΠΌ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
+
+#: apply.c:2274
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s"
+
+#: apply.c:2278
+#, c-format
+msgid "unable to open or read %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΡΡ %s"
+
+#: apply.c:2931
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π½Π°ΡΠ°Π»ΠΎ ΡΡΡΠΎΠΊΠΈ: «%c»"
+
+#: apply.c:3050
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΡ)."
+msgstr[1] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΠΈ)."
+msgstr[2] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)."
+msgstr[3] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)."
+
+#: apply.c:3062
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "ΠΠΎΠ½ΡΠ΅ΠΊΡΡ ΡΡΠΆΠ΅Π½ Π΄ΠΎ (%ld/%ld), ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΡΠ°Π³ΠΌΠ΅Π½Ρ Π½Π° %d ΡΡΡΠΎΠΊΠ΅"
+
+#: apply.c:3068
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr "ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅:\n%.*s"
+
+#: apply.c:3090
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "ΠΏΡΠΎΠΏΡΡΠ΅Π½Ρ Π΄Π°Π½Π½ΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ «%s»"
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ reverse-apply Π΄Π»Ρ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ°, Π±Π΅Π· ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π»ΠΎΠΊΠ° «%s»"
+
+#: apply.c:3144
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ «%s» Π±Π΅Π· ΡΡΡΠΎΠΊΠΈ Ρ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ ΠΏΠΎΠ»Π½ΠΎΠΉ Π²Π΅ΡΡΠΈΠ΅ΠΉ ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
+
+#: apply.c:3154
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡΡ ΠΊ ΡΠ°ΠΉΠ»Ρ «%s» (%s), Π½ΠΎ Π΅Π³ΠΎ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΠ²ΡΠ΅Ρ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠΎΠΌΡ."
+
+#: apply.c:3162
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΠΏΡΡΡΠΎΠΌΡ ΡΠ°ΠΉΠ»Ρ «%s», Π½ΠΎ ΡΠ°ΠΉΠ» Π½Π΅ ΠΏΡΡΡΠΎΠΉ"
+
+#: apply.c:3180
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΡ ΠΏΠΎΡΡΠ»ΠΊΡ %s Π΄Π»Ρ «%s»"
+
+#: apply.c:3193
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ ΠΊ «%s»"
+
+#: apply.c:3199
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "ΠΏΠΎΡΠ»Π΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ «%s» Π±ΡΠ» ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ (ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s)"
+
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: %s:%ld"
+
+#: apply.c:3342
+#, c-format
+msgid "cannot checkout %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° %s"
+
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s"
+
+#: apply.c:3398
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "ΡΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· «%s» Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ"
+
+#: apply.c:3427 apply.c:3667
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "ΠΏΡΡΡ %s Π±ΡΠ» ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½/ΡΠ΄Π°Π»Π΅Π½"
+
+#: apply.c:3510 apply.c:3681
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: Π½Π΅Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
+
+#: apply.c:3519 apply.c:3689
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ"
+
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "Π² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π»Ρ ΠΎΡΠΊΠ°ΡΠ° ΠΊ ΡΡΡΡ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ."
+
+#: apply.c:3557
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "ΠΡΠΊΠ°Ρ ΠΊ ΡΡΡΡ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ…\n"
+
+#: apply.c:3573 apply.c:3577
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ «%s»"
+
+#: apply.c:3589
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΠ°ΡΠΈΡΡΡΡ ΠΊ ΡΡΡΡ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ…\n"
+
+#: apply.c:3603
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "ΠΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ ΠΊ «%s» Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°ΠΌΠΈ.\n"
+
+#: apply.c:3608
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "ΠΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ ΠΊ «%s» Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ.\n"
+
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "ΠΏΠ°ΡΡ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ ΡΠ΄Π°Π»ΠΈΠ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π°"
+
+#: apply.c:3706
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΈΠΏ"
+
+#: apply.c:3708
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s ΠΈΠΌΠ΅Π΅Ρ ΡΠΈΠΏ %o, Π° ΠΎΠΆΠΈΠ΄Π°Π»ΡΡ %o"
+
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΡΡΡ «%s»"
+
+#: apply.c:3917
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
+
+#: apply.c:3920
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
+
+#: apply.c:3940
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o)"
+
+#: apply.c:3945
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s"
+
+#: apply.c:3965
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "Π·Π°ΡΡΠΎΠ½ΡΡΡΠΉ ΡΠ°ΠΉΠ» «%s» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ"
+
+#: apply.c:3969
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ"
+
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΠ°ΡΡΠ° %s…"
+
+#: apply.c:4075
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± sha1 ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΠΈΠ»ΠΈ Π±Π΅ΡΠΏΠΎΠ»Π΅Π·Π½Π° Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s"
+
+#: apply.c:4082
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ ΡΠ΅ΠΆΠΈΠΌ Π΄Π»Ρ %s, ΠΊΠΎΡΠΎΡΡΠΉ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π² ΡΠ΅ΠΊΡΡΠ΅ΠΌ HEAD"
+
+#: apply.c:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± sha1 ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΠΈΠ»ΠΈ Π±Π΅ΡΠΏΠΎΠ»Π΅Π·Π½Π° (%s)."
+
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "ΡΠ±ΠΎΠΉ make_cache_entry Π΄Π»Ρ ΠΏΡΡΠΈ «%s»"
+
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ %s Π²ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ"
+
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄ΠΊΠ΅ΠΊΡ Π² %s"
+
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
+
+#: apply.c:4277
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ ΠΏΠ°ΡΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s"
+
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° «%s»"
+
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %s"
+
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΊΡΡΠ΅ Π΄Π»Ρ %s"
+
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² «%s»"
+
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr "Π·Π°ΠΊΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Π° «%s»"
+
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» «%s» Ρ ΡΠ΅ΠΆΠΈΠΌΠΎΠΌ Π΄ΠΎΡΡΡΠΏΠ° %o"
+
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "ΠΠ°ΡΡ %s ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ."
+
+#: apply.c:4518
+msgid "internal error"
+msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°"
+
+#: apply.c:4521
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·ΠΎΠΌ…"
+msgstr[1] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈ…"
+msgstr[2] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈ…"
+msgstr[3] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈ…"
+
+#: apply.c:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "ΡΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠΌΠ΅Π½ΠΈ .rej ΡΠ°ΠΉΠ»Π° Π΄ΠΎ %.*s.rej"
+
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s"
+
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "ΠΠ»ΠΎΠΊ β%d ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ."
+
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "ΠΠ»ΠΎΠΊ β%d ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½."
+
+#: apply.c:4668
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "ΠΠ°ΡΡ «%s» ΠΏΡΠΎΠΏΡΡΠ΅Π½."
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π²Π²ΠΎΠ΄"
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΏΠ°ΡΡ «%s»: %s"
+
+#: apply.c:4858
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° %d ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
+msgstr[1] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
+msgstr[2] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
+msgstr[3] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
+
+#: apply.c:4864 apply.c:4879
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d ΡΡΡΠΎΠΊΠ° Π΄ΠΎΠ±Π°Π²ΠΈΠ»Π° ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
+msgstr[1] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
+msgstr[2] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
+msgstr[3] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
+
+#: apply.c:4872
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "%d ΡΡΡΠΎΠΊΠ° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π° ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
."
+msgstr[1] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
."
+msgstr[2] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
."
+msgstr[3] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
."
+
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
+
+#: apply.c:4919 apply.c:4922 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:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "ΠΏΡΡΡ"
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ"
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ"
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ"
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "ΡΠ΄Π°Π»ΠΈΡΡ <ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ> Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΡΡΡ
ΡΠ΅ΡΡ ΠΈΠ· ΡΡΠ°Π΄ΠΈΡΠΈΠΎΠ½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΡΠΏΠΈΡΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ, ΡΠ΄Π΅Π»Π°Π½Π½ΡΠ΅ ΡΡΠΈΠΌ ΠΏΠ°ΡΡΠ΅ΠΌ"
+
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΉ ΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°"
+
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
ΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΡΡΡΠΎΠΊ Π² Π΄Π΅ΡΡΡΠΈΡΠ½ΠΎΠΌ ΠΏΡΠ΅Π΄ΡΡΠ°Π²Π»Π΅Π½ΠΈΠΈ"
+
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°"
+
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ Π»ΠΈ ΠΎΠ½"
+
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΡΠ΅ΠΊΡΡΠ΅ΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΡ"
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ, Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "ΠΏΡΠΈΠ½ΡΡΡ ΠΏΠ°ΡΡ, ΠΊΠΎΡΠΎΡΡΠΉ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Π΅Ρ ΡΠ°ΠΉΠ»Ρ Π·Π° ΡΠ°Π±ΠΎΡΠΈΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "Π° ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Ρ --stat/--summary/--check)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "ΠΏΠΎΠΏΡΡΠ°ΡΡΡΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π΅ΡΠ»ΠΈ ΠΏΠ°ΡΡ Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "ΠΏΠΎΡΡΡΠΎΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΠΉ Π½Π° Π²ΡΡΡΠΎΠ΅Π½Π½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "ΠΏΡΡΠΈ, ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠ΅ ΠΠ£ΠΠΠΠ«Π ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠΌ"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΠΎ ΠΊΡΠ°ΠΉΠ½Π΅ΠΉ ΠΌΠ΅ΡΠ΅ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅"
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΠΈΠ»ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Ρ ΠΊΠΎΡΠΎΡΡΡ
Π΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ Ρ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "Π½Π΅ ΠΎΠΆΠΈΠ΄Π°ΡΡ ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ ΠΎΠ΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½Π½ΡΠ΅ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΡ
*.rej ΡΠ°ΠΉΠ»Π°Ρ
"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΊΡΡΠ²Π°ΡΡΠΈΠ΅ΡΡ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅"
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π½Π΅ΠΊΠΎΡΡΠ΅ΠΊΡΠ½ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π½ΡΠ΅ ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ Π² ΠΊΠΎΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Π°"
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "Π½Π΅ Π΄ΠΎΠ²Π΅ΡΡΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΡΡΡΠΎΠΊ ΠΈΠ· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π±Π»ΠΎΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "ΠΊΠΎΡΠ΅Π½Ρ"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ <ΠΊΠΎΡΠ΅Π½Ρ> ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊΠΎ Π²ΡΠ΅ΠΌ ΠΈΠΌΠ΅Π½Π°ΠΌ ΡΠ°ΠΉΠ»ΠΎΠ²"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<ΠΎΠΏΡΠΈΠΈ>] <ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°> [<ΠΏΡΡΡ>…]"
@@ -106,7 +720,7 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [--exec <ΠΊΠΎΠΌΠ°Π½Π΄Π°>] --list"
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ «%s» Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ Π½ΠΈ ΠΎΠ΄Π½ΠΎΠΌΡ ΡΠ°ΠΉΠ»Ρ"
@@ -119,7 +733,7 @@
msgid "archive format"
msgstr "ΡΠΎΡΠΌΠ°Ρ Π°ΡΡ
ΠΈΠ²Π°"
-#: archive.c:430 builtin/log.c:1422
+#: archive.c:430 builtin/log.c:1429
msgid "prefix"
msgstr "ΠΏΡΠ΅ΡΠΈΠΊΡ"
@@ -127,11 +741,11 @@
msgid "prepend prefix to each pathname in the archive"
msgstr "Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ ΠΏΡΠ΅ΡΠΈΠΊΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠ°ΠΆΠ΄ΡΠΌ ΠΏΡΡΠ΅ΠΌ ΡΠ°ΠΉΠ»Π° Π² Π°ΡΡ
ΠΈΠ²Π΅"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
-#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
-#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
+#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
msgid "file"
msgstr "ΡΠ°ΠΉΠ»"
@@ -163,8 +777,8 @@
msgid "list supported archive formats"
msgstr "ΠΏΠ΅ΡΠ΅ΡΠΈΡΠ»ΠΈΡΡ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠΎΡΠΌΠ°ΡΡ Π°ΡΡ
ΠΈΠ²ΠΎΠ²"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
msgid "repo"
msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ"
@@ -172,7 +786,7 @@
msgid "retrieve the archive from remote repository <repo>"
msgstr "ΠΏΠΎΠ»ΡΡΠΈΡΡ Π°ΡΡ
ΠΈΠ² ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Π°"
@@ -421,27 +1035,27 @@
"\"git push -u\" to set the upstream config as you push."
msgstr "\nΠΡΠ»ΠΈ Π²Ρ ΠΏΠ»Π°Π½ΠΈΡΡΠ΅ΡΠ΅ ΠΎΡΠ½ΠΎΠ²ΡΠ²Π°ΡΡ ΡΠ²ΠΎΡ ΡΠ°Π±ΠΎΡΡ Π½Π° Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅, ΠΊΠΎΡΠΎΡΠ°Ρ ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ, Π²Π°ΠΌ ΠΌΠΎΠΆΠ΅Ρ ΠΏΠΎΡΡΠ΅Π±ΠΎΠ²Π°ΡΡΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ «git fetch» Π΄Π»Ρ Π΅Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ.\n\nΠΡΠ»ΠΈ Π²Ρ ΠΏΠ»Π°Π½ΠΈΡΡΠ΅ΡΠ΅ ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ Π½ΠΎΠ²ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ, ΠΊΠΎΡΠΎΡΠ°Ρ Π±ΡΠ΄Π΅Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡΡΡ, Π²ΠΎ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ, Π²Π°ΠΌ ΠΌΠΎΠΆΠ΅Ρ ΠΏΠΎΡΡΠ΅Π±ΠΎΠ²Π°ΡΡΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ «git push -u» — ΡΡΠΎΠ±Ρ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ."
-#: branch.c:266
+#: branch.c:265
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: «%s»."
-#: branch.c:286
+#: branch.c:285
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "ΠΠ΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: «%s»."
-#: branch.c:291
+#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΠΎΡΠΊΠ° Π²Π΅ΡΠΊΠΈ: «%s»."
-#: branch.c:345
+#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» ΡΠΆΠ΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π½Π° «%s»"
-#: branch.c:364
+#: branch.c:363
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° %s Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ½"
@@ -456,7 +1070,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:778
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s»"
@@ -465,9 +1079,9 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Π ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 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:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΠΈ ΠΏΡΠΎΡ
ΠΎΠ΄Π° ΠΏΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΌ"
@@ -511,7 +1125,7 @@
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ΡΡΡΠ»ΠΊΠ° «%s» ΠΈΡΠΊΠ»ΡΡΠ΅Π½Π° Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ rev-list"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ: %s"
@@ -534,8 +1148,8 @@
msgid "invalid color value: %.*s"
msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ²Π΅ΡΠ°: %.*s"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
msgid "could not parse %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ %s"
@@ -545,6 +1159,13 @@
msgid "%s %s is not a commit!"
msgstr "%s %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ!"
+#: commit.c:1514
+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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ UTF-8.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Ρ
ΠΎΡΠΈΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ Π΅Π³ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ\nΠΈΠ»ΠΈ Π½Π°ΡΡΡΠΎΠΈΡΡ ΠΎΠΏΡΠΈΡ i18n.commitencoding ΠΈ ΡΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΡ\nΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅Ρ Π²Π°Ρ ΠΏΡΠΎΠ΅ΠΊΡ.\n"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "ΠΏΠ°ΠΌΡΡΡ ΠΈΡΡΠ΅ΡΠΏΠ°Π½Π°"
@@ -627,7 +1248,7 @@
msgid "failed to expand user dir in: '%s'"
msgstr "ΡΠ±ΠΎΠΉ ΡΠ°Π·Π²ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ ΠΏΡΡΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ: «%s»"
-#: config.c:849 config.c:860
+#: config.c:852 config.c:863
#, c-format
msgid "bad zlib compression level %d"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΡΠΎΠ²Π΅Π½Ρ ΡΠΆΠ°ΡΠΈΡ zlib %d"
@@ -670,22 +1291,58 @@
msgid "could not unset '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ±ΡΠΎΡΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ «%s»"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "ΠΠ½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΡΠ²Π΅Ρ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΠ»ΡΡ Π΄ΠΎ Π½Π°ΡΠ°Π»Π° ΡΠ΅Π°Π½ΡΠ° ΡΠ²ΡΠ·ΠΈ"
+
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ.\n\nΠ£Π΄ΠΎΡΡΠΎΠ²Π΅ΡΡΡΠ΅ΡΡ, ΡΡΠΎ Ρ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΏΡΠ°Π²Π° Π΄ΠΎΡΡΡΠΏΠ°\nΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ."
+
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ"
-#: connected.c:74
+#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ «git rev-list»"
-#: connected.c:94
+#: connected.c:95
msgid "failed write to rev-list"
msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ Π² rev-list"
-#: connected.c:101
+#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΊΡΡΡΠΈΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π° Ρ rev-list"
+#: convert.c:201
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr "CRLF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° LF Π² %s.\nΠ€Π°ΠΉΠ» Π±ΡΠ΄Π΅Ρ ΠΈΠΌΠ΅ΡΡ ΡΠ²ΠΎΠΈ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ ΠΊΠΎΠ½ΡΡ ΡΡΡΠΎΠΊ Π² ΡΠ°ΡΠ΅ΠΉ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ."
+
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° LF Π² %s."
+
+#: convert.c:211
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr "LF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° CRLF Π² %s.\nΠ€Π°ΠΉΠ» Π±ΡΠ΄Π΅Ρ ΠΈΠΌΠ΅ΡΡ ΡΠ²ΠΎΠΈ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ ΠΊΠΎΠ½ΡΡ ΡΡΡΠΎΠΊ Π² ΡΠ°ΡΠ΅ΠΉ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ."
+
+#: convert.c:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° CRLF Π² %s"
+
#: date.c:97
msgid "in the future"
msgstr "Π² Π±ΡΠ΄ΡΡΠ΅ΠΌ"
@@ -777,131 +1434,321 @@
msgid "failed to read orderfile '%s'"
msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ orderfile «%s»"
-#: diffcore-rename.c:540
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "ΠΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π΅ΡΠΎΡΠ½ΠΎΠ΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ"
-#: diff.c:116
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ «%s» ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π·Π½Π°ΡΠ΅Π½ΠΈΡ"
+
+#: diff.c:124
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° Π²Π΅Π»ΠΈΡΠΈΠ½Ρ ΡΡΠ΅Π·Π° (cut-off) Ρ dirstat «%s»\n"
-#: diff.c:121
+#: diff.c:129
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ dirstat: «%s»\n"
-#: diff.c:225
+#: diff.c:283
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ «diff.submodule»: «%s»"
-#: diff.c:277
+#: diff.c:346
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "ΠΠ°ΠΉΠ΄Π΅Π½Ρ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ «diff.dirstat»:\n%s"
-#: diff.c:3017
+#: diff.c:3087
#, c-format
msgid "external diff died, stopping at %s"
msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΡΠ°Π²Π½Π΅Π½ΠΈΠΈ, ΠΎΡΡΠ°Π½ΠΎΠ² Π½Π° %s"
-#: diff.c:3415
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check ΠΈ -s Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
+
+#: diff.c:3502
msgid "--follow requires exactly one pathspec"
msgstr "--follow ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΎΠ²Π½ΠΎ ΠΎΠ΄Π½ΠΎΠΉ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ"
-#: diff.c:3578
+#: diff.c:3665
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr "Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΎΠΏΡΠΈΠΈ --dirstat/-X :\n%s"
-#: diff.c:3592
+#: diff.c:3679
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΎΠΏΡΠΈΠΈ --submodule: «%s»"
-#: dir.c:1823
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "Π½Π΅ΡΠΎΡΠ½ΠΎΠ΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ Π±ΡΠ»ΠΎ ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ ΠΈΠ·-Π·Π° ΡΠ»ΠΈΡΠΊΠΎΠΌ Π±ΠΎΠ»ΡΡΠΎΠ³ΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Π° ΡΠ°ΠΉΠ»ΠΎΠ²."
+
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr "Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠΏΠΈΠΈ ΠΈΠ· ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΠΈΠ·-Π·Π° ΡΠ»ΠΈΡΠΊΠΎΠΌ Π±ΠΎΠ»ΡΡΠΎΠ³ΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Π° ΡΠ°ΠΉΠ»ΠΎΠ²."
+
+#: diff.c:4706
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²Ρ Π·Π°Ρ
ΠΎΡΠΈΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΡ %s Π² ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %d ΠΈ ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ Π²ΡΠ·ΠΎΠ² ΠΊΠΎΠΌΠ°Π½Π΄Ρ."
+
+#: dir.c:1866
msgid "failed to get kernel name and information"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠΌΡ ΡΠ΄ΡΠ° ΠΈ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ"
-#: dir.c:1942
+#: dir.c:1985
msgid "Untracked cache is disabled on this system or location."
msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠΊΠ»ΡΡΠ΅Π½ Π½Π° ΡΡΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΠ΅ ΠΈΠ»ΠΈ Π² ΡΡΠΎΠΌ ΠΌΠ΅ΡΡΠ΅."
-#: gpg-interface.c:178
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ΠΏΠ΅ΡΠ΅Π΄Π°ΡΠ° ΡΠΏΠΈΡΠΊΠ° Π΄Π»Ρ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΡΡΠΈ"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ACK/NAK, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ EOF"
+
+#: fetch-pack.c:243
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ACK/NAK, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ «%s»"
+
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc ΡΡΠ΅Π±ΡΠ΅Ρ multi_ack_detailed"
+
+#: fetch-pack.c:381
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ: %s"
+
+#: fetch-pack.c:387
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΠΏΠΎΠ»Π½ΠΎΠ³ΠΎ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ: %s"
+
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
+msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½: %s"
+
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
+msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΎΠ±ΡΠ΅ΠΊΡΠ΅: %s"
+
+#: fetch-pack.c:394
+#, c-format
+msgid "no shallow found: %s"
+msgstr "ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½: %s"
+
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ shallow/unshallow, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s"
+
+#: fetch-pack.c:436
+#, c-format
+msgid "got %s %d %s"
+msgstr "ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s %d %s"
+
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s"
+
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "ΠΎΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Ρ Π΄Π°Π»ΡΠ½Π΅ΠΉΡΠΈΠ΅ ΠΏΠΎΠΏΡΡΠΊΠΈ"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "Π³ΠΎΡΠΎΠ²ΠΎ"
+
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s (%d) %s"
+
+#: fetch-pack.c:551
+#, c-format
+msgid "Marking %s as complete"
+msgstr "ΠΠΎΠΌΠ΅ΡΠ°Ρ %s ΠΊΠ°ΠΊ Π·Π°Π²Π΅ΡΡΠ΅Π½Π½ΡΠΉ"
+
+#: fetch-pack.c:697
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ΡΠΆΠ΅ Π΅ΡΡΡ %s (%s)"
+
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π°Π½Π½ΡΡ
"
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΎΡΠΎΠΊΠΎΠ»Π°: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ ΠΏΠΎΡΠΎΠΊΠ°"
+
+#: fetch-pack.c:799
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ %s"
+
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "%s Π·Π°Π²Π΅ΡΡΠ΅Π½ Ρ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ"
+
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π°Π½Π½ΡΡ
"
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΊΠ»ΠΈΠ΅Π½ΡΠΎΠ² Ρ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ"
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ multi_ack_detailed"
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ no-done"
+
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ multi_ack"
+
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ side-band-64k"
+
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ side-band"
+
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ allow-tip-sha1-in-want"
+
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ofs-delta"
+
+#: fetch-pack.c:890
+#, c-format
+msgid "Server version is %.*s"
+msgstr "ΠΠ΅ΡΡΠΈΡ ΡΠ΅ΡΠ²Π΅ΡΠ° %.*s"
+
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ --shallow-since"
+
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ --shallow-exclude"
+
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ --deepen"
+
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "Π½Π΅ ΠΎΠ±ΡΠΈΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²"
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠΈ Π΄Π°Π½Π½ΡΡ
."
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "Π½Π΅Ρ ΡΠΎΠΎΡΠ²Π΅ΡΡΠ²ΡΡΡΠ΅Π³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π΅ΡΠΊΡ"
+
+#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅"
-#: gpg-interface.c:208
+#: gpg-interface.c:215
msgid "could not create temporary file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ»"
-#: gpg-interface.c:210
+#: gpg-interface.c:217
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ Π² «%s»"
-#: grep.c:1792
+#: grep.c:1782
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠ΅ΡΡΡ %s"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat «%s»"
-#: grep.c:1820
+#: grep.c:1810
#, c-format
msgid "'%s': short read"
msgstr "«%s»: ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ°Π»ΠΎ Π΄Π°Π½Π½ΡΡ
ΠΏΡΠΎΡΠΈΡΠ°Π½ΠΎ"
-#: help.c:205
+#: help.c:203
#, c-format
msgid "available git commands in '%s'"
msgstr "Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ git Π² «%s»"
-#: help.c:212
+#: help.c:210
msgid "git commands available from elsewhere on your $PATH"
msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Ρ git, Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ Π² Π΄ΡΡΠ³ΠΈΡ
ΠΌΠ΅ΡΡΠ°Ρ
Π²Π°ΡΠ΅Π³ΠΎ $PATH"
-#: help.c:244
+#: help.c:241
msgid "These are common Git commands used in various situations:"
msgstr "Π‘ΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Git ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΡΠ΅ Π² ΡΠ°Π·Π»ΠΈΡΠ½ΡΡ
ΡΠΈΡΡΠ°ΡΠΈΡΡ
:"
-#: help.c:309
+#: help.c:306
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr "«%s» ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Ρ git, Π½ΠΎ Π½Π°ΠΌ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΅Π΅ Π·Π°ΠΏΡΡΡΠΈΡΡ. ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, git-%s Π½Π΅ ΡΠ°Π±ΠΎΡΠ°Π΅Ρ?"
-#: help.c:366
+#: help.c:361
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "ΠΠΉ-ΡΠΉ! ΠΠ°ΡΠ° ΡΠΈΡΡΠ΅ΠΌΠ° Π½Π΅ ΡΠΎΠΎΠ±ΡΠ°Π΅Ρ Π½ΠΈ ΠΎ ΠΊΠ°ΠΊΠΈΡ
ΠΊΠΎΠΌΠ°Π½Π΄Π°Ρ
Git Π²ΠΎΠΎΠ±ΡΠ΅."
-#: help.c:388
+#: help.c:383
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr "ΠΠΠΠΠΠΠΠ: ΠΡ Π²ΡΠ·Π²Π°Π»ΠΈ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Git «%s», Π½ΠΎ ΡΠ°ΠΊΠΎΠΉ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ.\nΠΡΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ Ρ ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ΠΌ, ΡΡΠΎ Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ «%s»"
-#: help.c:393
+#: help.c:388
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "ΡΠ΅ΡΠ΅Π· %0.1f ΡΠ΅ΠΊΡΠ½Π΄ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ…"
-#: help.c:400
+#: help.c:395
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: «%s» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ git. Π‘ΠΌΠΎΡΡΠΈΡΠ΅ «git --help»."
-#: help.c:404 help.c:470
+#: help.c:399 help.c:465
msgid ""
"\n"
"Did you mean this?"
@@ -913,11 +1760,26 @@
msgstr[2] "\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ ΡΡΠΎ-ΡΠΎ ΠΈΠ· ΡΡΠΎΠ³ΠΎ?"
msgstr[3] "\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ ΡΡΠΎ-ΡΠΎ ΠΈΠ· ΡΡΠΎΠ³ΠΎ?"
-#: help.c:466
+#: help.c:461
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
+#: ident.c:334
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr "\n*** ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΠΌΠ½Π΅ ΠΊΡΠΎ Π²Ρ Π΅ΡΡΡ.\n\nΠΠ°ΠΏΡΡΡΠΈΡΠ΅\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"ΠΠ°ΡΠ΅ ΠΠΌΡ\"\n\nΠ΄Π»Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΎΠ½Π½ΡΡ
Π΄Π°Π½Π½ΡΡ
Π°ΠΊΠΊΠ°ΡΠ½ΡΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ.\nΠΡΠΎΠΏΡΡΡΠΈΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --global Π΄Π»Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π΄Π°Π½Π½ΡΡ
ΡΠΎΠ»ΡΠΊΠΎ Π΄Π»Ρ ΡΡΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ.\n\n"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -939,8 +1801,8 @@
msgid "failed to read the cache"
msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΊΡΡΠ°"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
msgid "unable to write new index file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
@@ -976,7 +1838,7 @@
msgid "refusing to lose untracked file at '%s'"
msgstr "ΠΎΡΠΊΠ°Π· ΠΏΠΎΡΠ΅ΡΠΈ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° Π² «%s»"
-#: merge-recursive.c:796
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
msgid "cannot read object %s '%s'"
msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s «%s»"
@@ -1109,7 +1971,7 @@
msgid "Auto-merging %s"
msgstr "ΠΠ²ΡΠΎΡΠ»ΠΈΡΠ½ΠΈΠ΅ %s"
-#: merge-recursive.c:1736 git-submodule.sh:919
+#: merge-recursive.c:1736 git-submodule.sh:924
msgid "submodule"
msgstr "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
@@ -1177,6 +2039,18 @@
msgid "Unable to write index."
msgstr "ΠΠ΅ ΡΠ΄Π°Π΅ΡΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ."
+#: notes-merge.c:273
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
+msgstr "ΠΡ Π½Π΅ Π·Π°ΠΊΠΎΠ½ΡΠΈΠ»ΠΈ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ (%s ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ).\nΠΠ°ΠΏΡΡΡΠΈΡΠ΅ «git notes merge --commit» ΠΈΠ»ΠΈ «git notes merge --abort» Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ»ΠΈ ΠΎΡΠΌΠ΅Π½Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ ΠΈ Π·Π°ΠΏΡΡΠΊΠ° Π½ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ."
+
+#: notes-merge.c:280
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "ΠΡ Π½Π΅ Π·Π°ΠΊΠΎΠ½ΡΠΈΠ»ΠΈ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ (%s ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ)."
+
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "ΠΠ΅Π»ΡΠ·Ρ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ Π½Π΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΠΈΠ»ΠΈ Π½Π΅ ΠΈΠΌΠ΅ΡΡΠ΅Π΅ ΡΡΡΠ»ΠΎΠΊ Π΄Π΅ΡΠ΅Π²ΠΎ Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
@@ -1233,7 +2107,7 @@
msgid "malformed object name '%s'"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° «%s»"
-#: path.c:798
+#: path.c:826
#, c-format
msgid "Could not make %s writable by group"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠ΅Π΄ΠΎΡΡΠ°Π²ΠΈΡΡ Π΄ΠΎΡΡΡΠΏ ΠΊ %s Π½Π° Π·Π°ΠΏΠΈΡΡ"
@@ -1287,55 +2161,57 @@
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: ΠΌΠ°Π³ΠΈΡΠ΅ΡΠΊΠΈΠ΅ ΡΠ»ΠΎΠ²Π° Π² ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°ΡΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ: %s"
-#: pathspec.c:433
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please"
+" use . instead if you meant to match all paths"
+msgstr "ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ ΠΊΠ°ΠΊ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΡ ΠΏΡΡΠΈ Π±ΡΠ΄ΡΡ ΡΠ΄Π΅Π»Π°Π½Ρ Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΌΠΈ Π² ΡΠ»Π΅Π΄ΡΡΡΠΈΡ
Π²Π΅ΡΡΠΈΡΡ
. ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π²ΠΌΠ΅ΡΡΠΎ Π½ΠΈΡ
«.», ΡΡΠΎ Π·Π½Π°ΡΠΈΡ ΡΠΎΠΎΡΠ²Π΅ΡΡΠ²ΠΈΠ΅ Π²ΡΠ΅ΠΌ ΠΏΡΡΡΠΌ"
+
+#: pathspec.c:440
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ «%s» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ"
-#: pathspec.c:442
+#: pathspec.c:449
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ ΡΠ°Π±Π»ΠΎΠ½ Π΄Π»Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ :(exclude).\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ «:/» ΠΈΠ»ΠΈ «.» ?"
-#: pretty.c:973
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΡΠΌΠ°Ρ Π΄Π»Ρ --pretty"
-#: progress.c:235
-msgid "done"
-msgstr "Π³ΠΎΡΠΎΠ²ΠΎ"
-
-#: read-cache.c:1281
+#: read-cache.c:1315
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr "index.version ΡΠΊΠ°Π·Π°Π½, Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΡ Π²Π΅ΡΡΠΈΡ %i"
-#: read-cache.c:1291
+#: read-cache.c:1325
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr "GIT_INDEX_VERSION ΡΠΊΠ°Π·Π°Π½, Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΡ Π²Π΅ΡΡΠΈΡ %i"
-#: refs.c:551 builtin/merge.c:840
+#: refs.c:576 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ"
-#: refs/files-backend.c:2534
+#: refs/files-backend.c:2481
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ %s: %s"
-#: refs/files-backend.c:2537
+#: refs/files-backend.c:2484
#, c-format
msgid "could not delete references: %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ: %s"
-#: refs/files-backend.c:2546
+#: refs/files-backend.c:2493
#, c-format
msgid "could not remove reference %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ %s"
@@ -1464,12 +2340,12 @@
msgid "ignoring broken ref %s"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΡΡ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s"
-#: ref-filter.c:1651
+#: ref-filter.c:1633
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° ΡΠ°ΡΡΠΈΡΠ° %%(end)"
-#: ref-filter.c:1705
+#: ref-filter.c:1687
#, c-format
msgid "malformed object name %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s"
@@ -1593,286 +2469,309 @@
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git pull», ΡΡΠΎΠ±Ρ ΡΠ»ΠΈΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ Π² Π²Π°ΡΡ)\n"
-#: revision.c:2132
+#: revision.c:2158
msgid "your current branch appears to be broken"
msgstr "ΠΏΠΎΡ
ΠΎΠΆΠ΅, Π²Π°ΡΠ° ΡΠ΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π°"
-#: revision.c:2135
+#: revision.c:2161
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Π²Π°ΡΠ° ΡΠ΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° «%s» Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½ΠΈ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: revision.c:2329
+#: revision.c:2355
msgid "--first-parent is incompatible with --bisect"
msgstr "ΠΎΠΏΡΠΈΡ --first-parent Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --bisect"
-#: run-command.c:92
+#: run-command.c:106
msgid "open /dev/null failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΎΡΠΊΡΡΡΠΈΡ /dev/null"
-#: run-command.c:94
+#: run-command.c:108
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) ΡΠ±ΠΎΠΉ"
-#: send-pack.c:298
+#: send-pack.c:297
msgid "failed to sign the push certificate"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠ°Π½ΠΈΡ ΡΠ΅ΡΡΠΈΡΠΈΠΊΠ°ΡΠ° ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ"
-#: send-pack.c:411
+#: send-pack.c:410
msgid "the receiving end does not support --signed push"
msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --signed"
-#: send-pack.c:413
+#: send-pack.c:412
msgid ""
"not sending a push certificate since the receiving end does not support "
"--signed push"
msgstr "Π½Π΅ ΠΎΡΠΏΡΠ°Π²Π»ΡΠ΅ΠΌ ΡΠ΅ΡΡΠΈΡΠΈΠΊΠ°Ρ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --signed"
-#: send-pack.c:425
+#: send-pack.c:424
msgid "the receiving end does not support --atomic push"
msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --atomic"
-#: send-pack.c:430
+#: send-pack.c:429
msgid "the receiving end does not support push options"
msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ"
-#: sequencer.c:174
+#: sequencer.c:171
+msgid "revert"
+msgstr "ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ"
+
+#: sequencer.c:228
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr "ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ², ΠΏΠΎΠΌΠ΅ΡΡΡΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΡΠΈ\nΡ ΠΏΠΎΠΌΠΎΡΡΡ «git add <ΠΏΡΡΠΈ>» ΠΈΠ»ΠΈ «git rm <ΠΏΡΡΠΈ>»"
-#: sequencer.c:177
+#: sequencer.c:231
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr "ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ², ΠΏΠΎΠΌΠ΅ΡΡΡΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΡΠΈ\nΡ ΠΏΠΎΠΌΠΎΡΡΡ «git add <ΠΏΡΡΠΈ>» ΠΈΠ»ΠΈ «git rm <ΠΏΡΡΠΈ>»\nΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git commit»"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Could not write to %s"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² %s"
+msgid "could not lock '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ «%s»"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid "Error wrapping up %s."
-msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΎΠ±ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ %s."
+msgid "could not write to '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² «%s»"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΊΠΎΠΏΠΈΠ΅ΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ eol Π² «%s»"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΎΠ±ΡΠ°ΡΠ½ΡΠΌΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ «%s»."
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Π‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ."
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ «%s»"
-#: sequencer.c:228
+#: sequencer.c:305
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "Π²Π°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ %s."
+
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "Π΄Π»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
."
+
+#: sequencer.c:324
#, c-format
msgid "%s: fast-forward"
msgstr "%s: ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: sequencer.c:399
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ\n"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°ΡΠΏΠΎΠ·Π½Π°ΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ\n"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΠΊΡΡΠ°\n"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΠΊΡΡΠ°\n"
-#: sequencer.c:393
+#: sequencer.c:483
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s\n"
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr "Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅. ΠΡΠ»ΠΈ ΡΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΎΠ±ΡΠ΅Π΄Π΅Π½Π΅Π½Ρ Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit --amend %s\n\nΠΡΠ»ΠΈ ΠΆΠ΅ ΠΎΠ½ΠΈ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΏΠΎΠΌΠ΅ΡΠ΅Π½Ρ Π² Π½ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit %s\n\nΠ Π»ΡΠ±ΠΎΠΌ ΡΠ»ΡΡΠ°Π΅, ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ ΠΊΠ°ΠΊ Π²Ρ Π·Π°ΠΊΠΎΠ½ΡΠΈΡΠ΅, ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΠ²:\n\n git rebase --continue\n"
-#: sequencer.c:398
+#: sequencer.c:567
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s\n"
+msgid "could not parse commit %s\n"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s\n"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "ΠΠ°Ρ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π΅ ΡΠ»ΠΈΡ."
-
-#: sequencer.c:482
+#: sequencer.c:572
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "ΠΠΎΠΌΠΌΠΈΡ %s — ΡΡΠΎ ΠΊΠΎΠΌΠΌΠΈΡ-ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π½ΠΎ ΠΎΠΏΡΠΈΡ -m Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π°."
+msgid "could not parse parent commit %s\n"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s\n"
-#: sequencer.c:490
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "Π²Π°Ρ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΡΠ»ΠΈΡ."
+
+#: sequencer.c:675
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Π£ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s Π½Π΅Ρ ΠΏΡΠ΅Π΄ΠΊΠ° %d"
+msgid "commit %s is a merge but no -m option was given."
+msgstr "ΠΊΠΎΠΌΠΌΠΈΡ %s — ΡΡΠΎ ΠΊΠΎΠΌΠΌΠΈΡ-ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π½ΠΎ ΠΎΠΏΡΠΈΡ -m Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π°."
-#: sequencer.c:494
+#: sequencer.c:683
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "ΠΡΠ½ΠΎΠ²Π½Π°Ρ Π²Π΅ΡΠΊΠ° ΡΠΊΠ°Π·Π°Π½Π°, Π½ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ."
+msgid "commit %s does not have parent %d"
+msgstr "Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s Π½Π΅Ρ ΠΏΡΠ΅Π΄ΠΊΠ° %d"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#: sequencer.c:687
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "ΠΎΡΠ½ΠΎΠ²Π½Π°Ρ Π²Π΅ΡΠΊΠ° ΡΠΊΠ°Π·Π°Π½Π°, Π½ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ."
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π΄Π»Ρ %s"
-#: sequencer.c:511
+#: sequencer.c:705
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ %s"
+msgid "cannot get commit message for %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ %s"
-#: sequencer.c:597
+#: sequencer.c:797
#, c-format
msgid "could not revert %s... %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s… %s"
-#: sequencer.c:598
+#: sequencer.c:798
#, c-format
msgid "could not apply %s... %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s… %s"
-#: sequencer.c:633
+#: sequencer.c:833
msgid "empty commit set passed"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ ΠΏΡΡΡΠΎΠΉ Π½Π°Π±ΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²"
-#: sequencer.c:641
+#: sequencer.c:843
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: sequencer.c:645
+#: sequencer.c:850
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: ΡΠ±ΠΎΠΉ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π΄ΡΡΠ³ΠΎΠ³ΠΎ ΠΏΡΠΎΡΠ΅ΡΡΠ° ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
-
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΏΡΠΎΡΠ΅ΡΡΠ° ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
-
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π΄ΡΡΠ³ΠΎΠ³ΠΎ ΠΏΡΠΎΡΠ΅ΡΡΠ° ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
-
-#: sequencer.c:732
+#: sequencer.c:944
#, c-format
-msgid "Could not parse line %d."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΡΡΠΎΠΊΡ %d."
+msgid "invalid line %d: %.*s"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° %d: %.*s"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "ΠΠΎΠΌΠΌΠΈΡΡ Π½Π΅ ΡΠ°Π·ΠΎΠ±ΡΠ°Π½Ρ."
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "ΠΊΠΎΠΌΠΌΠΈΡΡ Π½Π΅ ΡΠ°Π·ΠΎΠ±ΡΠ°Π½Ρ."
-#: sequencer.c:749
+#: sequencer.c:966
#, c-format
-msgid "Could not open %s"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s"
+msgid "could not read '%s'."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ «%s»."
-#: sequencer.c:753
+#: sequencer.c:972
#, c-format
-msgid "Could not read %s."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s."
+msgid "unusable instruction sheet: '%s'"
+msgstr "Π½Π΅ΠΏΡΠΈΠ³ΠΎΠ΄Π½Π°Ρ Π΄Π»Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠ°ΡΡΠ° Ρ ΠΈΠ½ΡΡΡΡΠΊΡΠΈΡΠΌΠΈ: «%s»"
-#: sequencer.c:760
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΏΡΠΎΡΠ΅ΡΡΠ° ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
+
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
+
+#: sequencer.c:1028
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "ΠΠ΅ΠΏΡΠΈΠ³ΠΎΠ΄Π½Π°Ρ Π΄Π»Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠ°ΡΡΠ° Ρ ΠΈΠ½ΡΡΡΡΠΊΡΠΈΡΠΌΠΈ: %s"
+msgid "invalid key: %s"
+msgstr "Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΊΠ»ΡΡ: %s"
-#: sequencer.c:790
+#: sequencer.c:1031
#, c-format
-msgid "Invalid key: %s"
-msgstr "ΠΠ΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΊΠ»ΡΡ: %s"
+msgid "invalid value for %s: %s"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s: %s"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:1063
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s: %s"
+msgid "malformed options sheet: '%s'"
+msgstr "ΠΈΡΠΏΠΎΡΡΠ΅Π½Π½Π°Ρ ΠΊΠ°ΡΡΠ° Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ: «%s»"
-#: sequencer.c:803
-#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "ΠΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½Π½Π°Ρ ΠΊΠ°ΡΡΠ° Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ: %s"
-
-#: sequencer.c:822
+#: sequencer.c:1101
msgid "a cherry-pick or revert is already in progress"
msgstr "ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΡΡΡΡ"
-#: sequencer.c:823
+#: sequencer.c:1102
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ «git cherry-pick (--continue | --quit | --abort)»"
-#: sequencer.c:827
+#: sequencer.c:1106
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² %s"
+msgid "could not create sequencer directory '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² «%s»"
-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ HEAD"
+
+#: sequencer.c:1151 sequencer.c:1289
msgid "no cherry-pick or revert in progress"
msgstr "ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΡΡΡΡ"
-#: sequencer.c:864
+#: sequencer.c:1153
msgid "cannot resolve HEAD"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD"
-#: sequencer.c:866 sequencer.c:900
+#: sequencer.c:1155 sequencer.c:1189
msgid "cannot abort from a branch yet to be born"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ Π²Π΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΠ°Ρ Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½Π°"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "cannot open %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s"
+msgid "cannot open '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s»"
-#: sequencer.c:888
+#: sequencer.c:1177
#, c-format
-msgid "cannot read %s: %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s: %s"
+msgid "cannot read '%s': %s"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ «%s»: %s"
-#: sequencer.c:889
+#: sequencer.c:1178
msgid "unexpected end of file"
msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠ½Π΅Ρ ΡΠ°ΠΉΠ»Π°"
-#: sequencer.c:895
+#: sequencer.c:1184
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Ρ HEAD ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ° «%s» ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½"
-#: sequencer.c:921
-#, c-format
-msgid "Could not format %s."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°ΡΡ %s."
-
-#: sequencer.c:1066
+#: sequencer.c:1354
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s"
-#: sequencer.c:1069
+#: sequencer.c:1358
#, c-format
msgid "%s: bad revision"
msgstr "%s: ΠΏΠ»ΠΎΡ
Π°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "Π½Π΅Π»ΡΠ·Ρ Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΡΡ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
#: setup.c:160
#, c-format
@@ -1897,11 +2796,6 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr "Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ «%s»: ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΠ΅ΠΉ ΠΈ ΠΈΠΌΠ΅Π½Π΅ΠΌ ΡΠ°ΠΉΠ»Π°.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «--» Π΄Π»Ρ ΠΎΡΠ΄Π΅Π»Π΅Π½ΠΈΡ ΠΏΡΡΠ΅ΠΉ ΠΎΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ, Π²ΠΎΡ ΡΠ°ΠΊ:\n«git <ΠΊΠΎΠΌΠ°Π½Π΄Π°> [<ΡΠ΅Π΄Π°ΠΊΡΠΈΡ>…] -- [<ΡΠ°ΠΉΠ»>…]»"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s"
-
#: setup.c:468
#, c-format
msgid "Expected git repo version <= %d, found %d"
@@ -1943,21 +2837,55 @@
"The owner of files must always have read and write permissions."
msgstr "ΠΡΠΎΠ±Π»Π΅ΠΌΠ° ΡΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΡΠ΅ΠΆΠΈΠΌΠ° Π΄ΠΎΡΡΡΠΏΠ° ΠΊ ΡΠ°ΠΉΠ»Ρ core.sharedRepository (0%.3o).\nΠΠ»Π°Π΄Π΅Π»Π΅Ρ ΡΠ°ΠΉΠ»ΠΎΠ² Π΄ΠΎΠ»ΠΆΠ΅Π½ Π²ΡΠ΅Π³Π΄Π° ΠΈΠΌΠ΅ΡΡ ΠΏΡΠ°Π²Π° Π½Π° ΡΡΠ΅Π½ΠΈΠ΅ ΠΈ Π½Π° Π·Π°ΠΏΠΈΡΡ."
-#: sha1_file.c:1046
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ΠΏΡΡΡ «%s» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ"
+
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» ΠΊΠ°ΠΊ ΡΠ²ΡΠ·Π°Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅, ΠΏΠΎΠΊΠ° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ."
+
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌ."
+
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ"
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΠ°ΡΠ΅Π½Π½ΡΠΌ"
+
+#: sha1_file.c:1159
msgid "offset before end of packfile (broken .idx?)"
msgstr "ΡΠ΄Π²ΠΈΠ³ Π΄ΠΎ ΠΊΠΎΠ½ΡΠ° ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ° (Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½ ΡΠ°ΠΉΠ» .idx?)"
-#: sha1_file.c:2434
+#: sha1_file.c:2592
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ΡΠ΄Π²ΠΈΠ³ Π΄ΠΎ Π½Π°ΡΠ°Π»Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π΄Π»Ρ %s (ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½ ΠΈΠ½Π΄Π΅ΠΊΡ?)"
-#: sha1_file.c:2438
+#: sha1_file.c:2596
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ΡΠ΄Π²ΠΈΠ³ Π·Π° ΠΏΡΠ΅Π΄Π΅Π»Π°ΠΌΠΈ ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π΄Π»Ρ %s (ΠΎΠ±ΡΠ΅Π·Π°Π½ ΠΈΠ½Π΄Π΅ΠΊΡ?)"
-#: sha1_name.c:462
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "ΡΠΎΠΊΡΠ°ΡΡΠ½Π½ΡΠΉ SHA1 ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ %s Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ΅Π½"
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ:"
+
+#: sha1_name.c:578
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"
@@ -1993,7 +2921,7 @@
msgid "staging updated .gitmodules failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΠΎΠ³ΠΎ .gitmodules"
-#: submodule.c:177
+#: submodule.c:158
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΡΠΏΡΠΈΡΠ°ΡΠ΅Π»ΡΠ½ΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ submodule.fetchJobs"
@@ -2002,56 +2930,56 @@
msgid "invalid value for %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s"
-#: trailer.c:237
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Π·Π°Π²Π΅ΡΡΠΈΡΠ΅Π»Ρ «%s»"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ «%s» Π΄Π»Ρ ΠΊΠ»ΡΡΠ° «%s»"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr "Π±ΠΎΠ»ΡΡΠ΅ ΠΎΠ΄Π½ΠΎΠ³ΠΎ %s"
-#: trailer.c:582
+#: trailer.c:672
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "ΠΏΡΡΡΠ°Ρ ΠΏΠΎΡΠ»Π΅Π΄Π½ΡΡ Π»Π΅ΠΊΡΠ΅ΠΌΠ° Π² Π·Π°Π²Π΅ΡΡΠΈΡΠ΅Π»Π΅ «%.*s»"
-#: trailer.c:702
+#: trailer.c:695
#, c-format
msgid "could not read input file '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π²Ρ
ΠΎΠ΄Π½ΠΎΠΉ ΡΠ°ΠΉΠ» «%s»"
-#: trailer.c:705
+#: trailer.c:698
msgid "could not read from stdin"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: trailer.c:857 builtin/am.c:42
+#: trailer.c:929 builtin/am.c:44
#, c-format
msgid "could not stat %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ %s"
-#: trailer.c:859
+#: trailer.c:931
#, c-format
msgid "file %s is not a regular file"
msgstr "ΡΠ°ΠΉΠ» %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΠ±ΡΡΠ½ΡΠΌ ΡΠ°ΠΉΠ»ΠΎΠΌ"
-#: trailer.c:861
+#: trailer.c:933
#, c-format
msgid "file %s is not writable by user"
msgstr "ΡΠ°ΠΉΠ» %s Π½Π΅ Π΄ΠΎΡΡΡΠΏΠ΅Π½ Π½Π° Π·Π°ΠΏΠΈΡΡ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ"
-#: trailer.c:873
+#: trailer.c:945
msgid "could not open temporary file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ»"
-#: trailer.c:912
+#: trailer.c:983
#, c-format
msgid "could not rename temporary file to %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π² %s"
@@ -2066,14 +2994,14 @@
msgid "transport: invalid depth option '%s'"
msgstr "ΡΡΠ°Π½ΡΠΏΠΎΡΡ: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π³Π»ΡΠ±ΠΈΠ½Ρ «%s»"
-#: transport.c:771
+#: transport.c:817
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΌ ΠΏΡΡΡΠΌ ΡΠΎΠ΄Π΅ΡΠΆΠ°Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΌ ΠΈΠ· Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²:\n"
-#: transport.c:775
+#: transport.c:821
#, c-format
msgid ""
"\n"
@@ -2089,15 +3017,31 @@
"\n"
msgstr "\nΠΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ\n\n\tgit push --recurse-submodules=on-demand\n\nΠΈΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π² ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ cd ΠΈ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ\n\n\tgit push\n\nΠ΄Π»Ρ ΠΈΡ
ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ.\n"
-#: transport.c:783
+#: transport.c:829
msgid "Aborting."
msgstr "ΠΡΠ΅ΡΡΠ²Π°Ρ."
-#: transport-helper.c:1041
+#: transport-helper.c:1075
#, c-format
msgid "Could not read ref %s"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ %s"
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΊΠΎΡΠΎΡΠΊΠΈΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π΅ΡΠ΅Π²Π°"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π² Π·Π°ΠΏΠΈΡΠΈ Π΄Π΅ΡΠ΅Π²Π°"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "ΠΏΡΡΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² Π·Π°ΠΏΠΈΡΠΈ Π΄Π΅ΡΠ΅Π²Π°"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΊΠΎΡΠΎΡΠΊΠΈΠΉ ΡΠ°ΠΉΠ» Π΄Π΅ΡΠ΅Π²Π°"
+
#: unpack-trees.c:64
#, c-format
msgid ""
@@ -2246,14 +3190,14 @@
#: unpack-trees.c:126
#, c-format
msgid ""
-"The following Working tree files would be overwritten by sparse checkout update:\n"
+"The following working tree files would be overwritten by sparse checkout update:\n"
"%s"
msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ:\n%s"
#: unpack-trees.c:128
#, c-format
msgid ""
-"The following Working tree files would be removed by sparse checkout update:\n"
+"The following working tree files would be removed by sparse checkout update:\n"
"%s"
msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ:\n%s"
@@ -2305,14 +3249,14 @@
msgid "could not open '%s' for reading and writing"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ ΠΈ Π·Π°ΠΏΠΈΡΠΈ"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
msgid "could not open '%s' for writing"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ"
@@ -2336,193 +3280,193 @@
msgid "could not close %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ %s"
-#: wt-status.c:150
+#: wt-status.c:151
msgid "Unmerged paths:"
msgstr "ΠΠ΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ:"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git reset %s <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git rm --cached <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)"
-#: wt-status.c:183
+#: wt-status.c:184
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git add <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)"
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git add/rm <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠ΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)"
-#: wt-status.c:187
+#: wt-status.c:188
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git rm <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)"
-#: wt-status.c:198 wt-status.c:882
+#: wt-status.c:199 wt-status.c:945
msgid "Changes to be committed:"
msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ Π²ΠΊΠ»ΡΡΠ΅Π½Ρ Π² ΠΊΠΎΠΌΠΌΠΈΡ:"
-#: wt-status.c:216 wt-status.c:891
+#: wt-status.c:217 wt-status.c:954
msgid "Changes not staged for commit:"
msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°:"
-#: wt-status.c:220
+#: wt-status.c:221
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git add <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠ°ΠΉΠ» Π² ΠΈΠ½Π΄Π΅ΠΊΡ)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git add/rm <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)"
-#: wt-status.c:223
+#: wt-status.c:224
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working "
"directory)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git checkout -- <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ\n Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅)"
-#: wt-status.c:225
+#: wt-status.c:226
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΌ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΠΎΠΌ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
)"
-#: wt-status.c:237
+#: wt-status.c:238
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git %s <ΡΠ°ΠΉΠ»>…», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π² ΡΠΎ, ΡΡΠΎ Π±ΡΠ΄Π΅Ρ Π²ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ)"
-#: wt-status.c:252
+#: wt-status.c:253
msgid "both deleted:"
msgstr "ΠΎΠ±Π° ΡΠ΄Π°Π»Π΅Π½Ρ:"
-#: wt-status.c:254
+#: wt-status.c:255
msgid "added by us:"
msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π½Π°ΠΌΠΈ:"
-#: wt-status.c:256
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ ΠΈΠΌΠΈ:"
-#: wt-status.c:258
+#: wt-status.c:259
msgid "added by them:"
msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΈΠΌΠΈ:"
-#: wt-status.c:260
+#: wt-status.c:261
msgid "deleted by us:"
msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ Π½Π°ΠΌΠΈ:"
-#: wt-status.c:262
+#: wt-status.c:263
msgid "both added:"
msgstr "ΠΎΠ±Π° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ:"
-#: wt-status.c:264
+#: wt-status.c:265
msgid "both modified:"
msgstr "ΠΎΠ±Π° ΠΈΠ·ΠΌΠ΅Π½Ρ:"
-#: wt-status.c:274
+#: wt-status.c:275
msgid "new file:"
msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ»:"
-#: wt-status.c:276
+#: wt-status.c:277
msgid "copied:"
msgstr "ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΎ:"
-#: wt-status.c:278
+#: wt-status.c:279
msgid "deleted:"
msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ:"
-#: wt-status.c:280
+#: wt-status.c:281
msgid "modified:"
msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ:"
-#: wt-status.c:282
+#: wt-status.c:283
msgid "renamed:"
msgstr "ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΎ:"
-#: wt-status.c:284
+#: wt-status.c:285
msgid "typechange:"
msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ ΡΠΈΠΏ:"
-#: wt-status.c:286
+#: wt-status.c:287
msgid "unknown:"
msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎ:"
-#: wt-status.c:288
+#: wt-status.c:289
msgid "unmerged:"
msgstr "Π½Π΅ ΡΠ»ΠΈΡΡΠ΅:"
-#: wt-status.c:370
+#: wt-status.c:371
msgid "new commits, "
msgstr "Π½ΠΎΠ²ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ, "
-#: wt-status.c:372
+#: wt-status.c:373
msgid "modified content, "
msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅, "
-#: wt-status.c:374
+#: wt-status.c:375
msgid "untracked content, "
msgstr "Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅, "
-#: wt-status.c:756
+#: wt-status.c:818
msgid "Submodules changed but not updated:"
msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅, Π½ΠΎ Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ:"
-#: wt-status.c:758
+#: wt-status.c:820
msgid "Submodule changes to be committed:"
msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Ρ:"
-#: wt-status.c:839
+#: wt-status.c:901
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr "ΠΠ΅ ΡΡΠΎΠ³Π°ΠΉΡΠ΅ ΡΡΡΠΎΠΊΡ Π²ΡΡΠ΅ ΡΡΠΎΠΉ.\nΠΡΡ, ΡΡΠΎ Π½ΠΈΠΆΠ΅ — Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½ΠΎ."
-#: wt-status.c:950
+#: wt-status.c:1013
msgid "You have unmerged paths."
msgstr "Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ."
-#: wt-status.c:953
+#: wt-status.c:1016
msgid " (fix conflicts and run \"git commit\")"
msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git commit»)"
-#: wt-status.c:955
+#: wt-status.c:1018
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git merge --abort», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ)"
-#: wt-status.c:960
+#: wt-status.c:1023
msgid "All conflicts fixed but you are still merging."
msgstr "ΠΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Ρ, Π½ΠΎ Π²Ρ Π²ΡΠ΅ Π΅ΡΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ."
-#: wt-status.c:963
+#: wt-status.c:1026
msgid " (use \"git commit\" to conclude merge)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git commit», ΡΡΠΎΠ±Ρ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅)"
-#: wt-status.c:973
+#: wt-status.c:1036
msgid "You are in the middle of an am session."
msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ΅ΡΡΠΈΠΈ am."
-#: wt-status.c:976
+#: wt-status.c:1039
msgid "The current patch is empty."
msgstr "Π’Π΅ΠΊΡΡΠΈΠΉ ΠΏΠ°ΡΡ ΠΏΡΡΡΠΎΠΉ."
-#: wt-status.c:980
+#: wt-status.c:1043
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git am --continue»)"
-#: wt-status.c:982
+#: wt-status.c:1045
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git am --skip», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ)"
-#: wt-status.c:984
+#: wt-status.c:1047
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git am --abort», ΡΡΠΎΠ±Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)"
-#: wt-status.c:1109
+#: wt-status.c:1172
msgid "No commands done."
msgstr "ΠΠΎΠΌΠ°Π½Π΄Ρ Π½Π΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½Ρ."
-#: wt-status.c:1112
+#: wt-status.c:1175
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
@@ -2531,16 +3475,16 @@
msgstr[2] "ΠΠΎΡΠ»Π΅Π΄Π½ΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½Π° (%d ΠΊΠΎΠΌΠ°Π½Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΎ):"
msgstr[3] "ΠΠΎΡΠ»Π΅Π΄Π½ΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½Π° (%d ΠΊΠΎΠΌΠ°Π½Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΎ):"
-#: wt-status.c:1123
+#: wt-status.c:1186
#, c-format
msgid " (see more in file %s)"
msgstr " (ΡΠΌΠΎΡΡΠΈΡΠ΅ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π² ΡΠ°ΠΉΠ»Π΅ %s)"
-#: wt-status.c:1128
+#: wt-status.c:1191
msgid "No commands remaining."
msgstr "ΠΠΎΠΌΠ°Π½Π΄ Π±ΠΎΠ»ΡΡΠ΅ Π½Π΅ ΠΎΡΡΠ°Π»ΠΎΡΡ."
-#: wt-status.c:1131
+#: wt-status.c:1194
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -2549,150 +3493,150 @@
msgstr[2] "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ (%d ΠΊΠΎΠΌΠ°Π½Π΄ ΠΎΡΡΠ°Π»ΠΎΡΡ):"
msgstr[3] "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ (%d ΠΊΠΎΠΌΠ°Π½Π΄ ΠΎΡΡΠ°Π»ΠΎΡΡ):"
-#: wt-status.c:1139
+#: wt-status.c:1202
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git rebase --edit-todo», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ ΠΈ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ)"
-#: wt-status.c:1152
+#: wt-status.c:1215
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°Π΅ΡΠ΅ Π²Π΅ΡΠΊΡ «%s» Π½Π°Π΄ «%s»."
-#: wt-status.c:1157
+#: wt-status.c:1220
msgid "You are currently rebasing."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°Π΅ΡΠ΅ Π²Π΅ΡΠΊΡ."
-#: wt-status.c:1171
+#: wt-status.c:1234
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git rebase --continue»)"
-#: wt-status.c:1173
+#: wt-status.c:1236
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git rebase --skip», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ)"
-#: wt-status.c:1175
+#: wt-status.c:1238
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git rebase --abort», ΡΡΠΎΠ±Ρ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)"
-#: wt-status.c:1181
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (Π²ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Ρ: Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git rebase --continue»)"
-#: wt-status.c:1185
+#: wt-status.c:1248
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°Π·Π΄Π΅Π»ΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ «%s» Π½Π°Π΄ «%s»."
-#: wt-status.c:1190
+#: wt-status.c:1253
msgid "You are currently splitting a commit during a rebase."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°Π·Π΄Π΅Π»ΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ."
-#: wt-status.c:1193
+#: wt-status.c:1256
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr "(ΠΠ°ΠΊ ΡΠΎΠ»ΡΠΊΠΎ Π²Π°Ρ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π±ΡΠ΄Π΅Ρ ΡΠΈΡΡΡΠΉ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git rebase --continue»)"
-#: wt-status.c:1197
+#: wt-status.c:1260
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ «%s» Π½Π°Π΄ «%s»."
-#: wt-status.c:1202
+#: wt-status.c:1265
msgid "You are currently editing a commit during a rebase."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ."
-#: wt-status.c:1205
+#: wt-status.c:1268
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git commit --amend», ΡΡΠΎΠ±Ρ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ)"
-#: wt-status.c:1207
+#: wt-status.c:1270
msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git rebase --continue», ΠΊΠΎΠ³Π΄Π° Π±ΡΠ΄Π΅ΡΠ΅ Π΄ΠΎΠ²ΠΎΠ»ΡΠ½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ)"
-#: wt-status.c:1217
+#: wt-status.c:1280
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "ΠΡ ΠΊΠΎΠΏΠΈΡΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ %s."
-#: wt-status.c:1222
+#: wt-status.c:1285
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git cherry-pick --continue»)"
-#: wt-status.c:1225
+#: wt-status.c:1288
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (Π²ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Ρ: Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git cherry-pick --continue»)"
-#: wt-status.c:1227
+#: wt-status.c:1290
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git cherry-pick --abort», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°)"
-#: wt-status.c:1236
+#: wt-status.c:1299
#, c-format
msgid "You are currently reverting commit %s."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΎΠ±ΡΠ°ΡΠ°Π΅ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s."
-#: wt-status.c:1241
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git revert --continue»)"
-#: wt-status.c:1244
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (Π²ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Ρ: Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git revert --continue»)"
-#: wt-status.c:1246
+#: wt-status.c:1309
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git revert --abort», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ°)"
-#: wt-status.c:1257
+#: wt-status.c:1320
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ°, Π½Π°ΡΠ°ΡΠΎΠ³ΠΎ Ρ Π²Π΅ΡΠΊΠΈ «%s»."
-#: wt-status.c:1261
+#: wt-status.c:1324
msgid "You are currently bisecting."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ°."
-#: wt-status.c:1264
+#: wt-status.c:1327
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git bisect reset», ΡΡΠΎΠ±Ρ Π²Π΅ΡΠ½ΡΡΡΡΡ Π½Π° ΠΈΡΡ
ΠΎΠ΄Π½ΡΡ Π²Π΅ΡΠΊΡ)"
-#: wt-status.c:1464
+#: wt-status.c:1524
msgid "On branch "
msgstr "ΠΠ° Π²Π΅ΡΠΊΠ΅ "
-#: wt-status.c:1470
+#: wt-status.c:1530
msgid "interactive rebase in progress; onto "
msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅; Π½Π°Π΄ "
-#: wt-status.c:1472
+#: wt-status.c:1532
msgid "rebase in progress; onto "
msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅; Π½Π°Π΄ "
-#: wt-status.c:1477
+#: wt-status.c:1537
msgid "HEAD detached at "
msgstr "HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π° "
-#: wt-status.c:1479
+#: wt-status.c:1539
msgid "HEAD detached from "
msgstr "HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π°ΡΠΈΠ½Π°Ρ Ρ "
-#: wt-status.c:1482
+#: wt-status.c:1542
msgid "Not currently on any branch."
msgstr "Π‘Π΅ΠΉΡΠ°Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΠΎΠΊ"
-#: wt-status.c:1500
+#: wt-status.c:1560
msgid "Initial commit"
msgstr "ΠΠ°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
-#: wt-status.c:1514
+#: wt-status.c:1574
msgid "Untracked files"
msgstr "ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: wt-status.c:1516
+#: wt-status.c:1576
msgid "Ignored files"
msgstr "ΠΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: wt-status.c:1520
+#: wt-status.c:1580
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2700,82 +3644,97 @@
"new files yourself (see 'git help status')."
msgstr "%.2f ΡΠ΅ΠΊΡΠ½Π΄Ρ Π·Π°Π½ΡΠ» Π²ΡΠ²ΠΎΠ΄ ΡΠΏΠΈΡΠΊΠ° Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ². «status -uno» Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΌΠΎΠΆΠ΅Ρ ΡΡΠΊΠΎΡΠΈΡΡ ΡΡΠΎ, Π½ΠΎ Π±ΡΠ΄ΡΡΠ΅ Π²Π½ΠΈΠΌΠ°ΡΠ΅Π»ΡΠ½Ρ, ΠΈ Π½Π΅ Π·Π°Π±ΡΠ΄ΡΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π²ΡΡΡΠ½ΡΡ (ΡΠΌΠΎΡΡΠΈΡΠ΅ «git help status» Π΄Π»Ρ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠ΅ΠΉ)."
-#: wt-status.c:1526
+#: wt-status.c:1586
#, c-format
msgid "Untracked files not listed%s"
msgstr "ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π½Π΅ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ%s"
-#: wt-status.c:1528
+#: wt-status.c:1588
msgid " (use -u option to show untracked files)"
msgstr "(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ «-u», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ)"
-#: wt-status.c:1534
+#: wt-status.c:1594
msgid "No changes"
msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-#: wt-status.c:1539
+#: wt-status.c:1599
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git add» ΠΈ/ΠΈΠ»ΠΈ «git commit -a»)\n"
-#: wt-status.c:1542
+#: wt-status.c:1602
#, c-format
msgid "no changes added to commit\n"
msgstr "Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n"
-#: wt-status.c:1545
+#: wt-status.c:1605
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ Π΅ΡΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git add», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡ ΠΈΡ
)\n"
-#: wt-status.c:1548
+#: wt-status.c:1608
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ Π΅ΡΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ\n"
-#: wt-status.c:1551
+#: wt-status.c:1611
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ (ΡΠΎΠ·Π΄Π°ΠΉΡΠ΅/ΡΠΊΠΎΠΏΠΈΡΡΠΉΡΠ΅ ΡΠ°ΠΉΠ»Ρ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git add», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡ ΠΈΡ
)\n"
-#: wt-status.c:1554 wt-status.c:1559
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
msgid "nothing to commit\n"
msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ\n"
-#: wt-status.c:1557
+#: wt-status.c:1617
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ «-u», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ)\n"
-#: wt-status.c:1561
+#: wt-status.c:1621
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ, Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅\n"
-#: wt-status.c:1668
+#: wt-status.c:1728
msgid "Initial commit on "
msgstr "ΠΠ°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π° "
-#: wt-status.c:1672
+#: wt-status.c:1732
msgid "HEAD (no branch)"
msgstr "HEAD (Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ)"
-#: wt-status.c:1701
+#: wt-status.c:1761
msgid "gone"
msgstr "ΠΈΡΡΠ΅Π·"
-#: wt-status.c:1703 wt-status.c:1711
+#: wt-status.c:1763 wt-status.c:1771
msgid "behind "
msgstr "ΠΏΠΎΠ·Π°Π΄ΠΈ"
-#: wt-status.c:1706 wt-status.c:1709
+#: wt-status.c:1766 wt-status.c:1769
msgid "ahead "
msgstr "Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ "
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ %s: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "ΠΊ ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ %s: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
msgid "failed to unlink '%s'"
msgstr "ΡΠ±ΠΎΠΉ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ «%s»"
@@ -2784,1023 +3743,510 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<ΠΎΠΏΡΠΈΠΈ>] [--] <ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΠΏΡΡΠΈ>…"
-#: builtin/add.c:65
+#: builtin/add.c:80
#, c-format
msgid "unexpected diff status %c"
msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ %c"
-#: builtin/add.c:71 builtin/commit.c:281
+#: builtin/add.c:85 builtin/commit.c:291
msgid "updating files failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/add.c:81
+#: builtin/add.c:95
#, c-format
msgid "remove '%s'\n"
msgstr "ΡΠ΄Π°Π»ΠΈΡΡ «%s»\n"
-#: builtin/add.c:136
+#: builtin/add.c:149
msgid "Unstaged changes after refreshing the index:"
msgstr "ΠΠ΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎΡΠ»Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°:"
-#: builtin/add.c:196 builtin/rev-parse.c:811
+#: builtin/add.c:209 builtin/rev-parse.c:840
msgid "Could not read the index"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/add.c:207
+#: builtin/add.c:220
#, c-format
msgid "Could not open '%s' for writing."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ."
-#: builtin/add.c:211
+#: builtin/add.c:224
msgid "Could not write patch"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΏΠ°ΡΡ"
-#: builtin/add.c:214
+#: builtin/add.c:227
msgid "editing patch failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ ΠΏΠ°ΡΡΠ°"
-#: builtin/add.c:217
+#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ «%s»"
-#: builtin/add.c:219
+#: builtin/add.c:232
msgid "Empty patch. Aborted."
msgstr "ΠΡΡΡΠΎΠΉ ΠΏΠ°ΡΡ. ΠΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π½Π°."
-#: builtin/add.c:224
+#: builtin/add.c:237
#, c-format
msgid "Could not apply '%s'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ «%s»"
-#: builtin/add.c:234
+#: builtin/add.c:247
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ ΠΏΡΡΠΈ ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ· Π²Π°ΡΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ² .gitignore:\n"
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "ΠΏΡΠΎΠ±Π½ΡΠΉ Π·Π°ΠΏΡΡΠΊ"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅"
-
-#: builtin/add.c:256
+#: builtin/add.c:269
msgid "interactive picking"
msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ Π²ΡΠ±ΠΎΡ"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ Π²ΡΠ±ΠΎΡ Π±Π»ΠΎΠΊΠΎΠ²"
-#: builtin/add.c:258
+#: builtin/add.c:271
msgid "edit current diff and apply"
msgstr "ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°ΠΉΠ» ΡΠ°Π·Π»ΠΈΡΠΈΠΉ ΠΈ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΅Π³ΠΎ"
-#: builtin/add.c:259
+#: builtin/add.c:272
msgid "allow adding otherwise ignored files"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΡ
ΠΈΠ½Π°ΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/add.c:260
+#: builtin/add.c:273
msgid "update tracked files"
msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/add.c:261
+#: builtin/add.c:274
msgid "record only the fact that the path will be added later"
msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°ΠΊΡ, ΡΡΠΎ ΠΏΡΡΡ Π±ΡΠ΄Π΅Ρ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ ΠΏΠΎΠ·ΠΆΠ΅"
-#: builtin/add.c:262
+#: builtin/add.c:275
msgid "add changes from all tracked and untracked files"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ· Π²ΡΠ΅Ρ
ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΠΈ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/add.c:265
+#: builtin/add.c:278
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΡΡΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° (ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ --no-all)"
-#: builtin/add.c:267
+#: builtin/add.c:280
msgid "don't add, only refresh the index"
msgstr "Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ, ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/add.c:268
+#: builtin/add.c:281
msgid "just skip files which cannot be added because of errors"
msgstr "ΠΏΡΠΎΠΏΡΡΠΊΠ°ΡΡ ΡΠ°ΠΉΠ»Ρ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ ΠΈΠ·-Π·Π° ΠΎΡΠΈΠ±ΠΎΠΊ"
-#: builtin/add.c:269
+#: builtin/add.c:282
msgid "check if - even missing - files are ignored in dry run"
msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ Π΄Π°ΠΆΠ΅ Π½Π΅Π΄ΠΎΡΡΠ°ΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ ΠΏΡΠΈ ΠΏΡΠΎΠ±Π½ΠΎΠΌ Π·Π°ΠΏΡΡΠΊΠ΅"
-#: builtin/add.c:270 builtin/update-index.c:958
+#: builtin/add.c:283 builtin/update-index.c:947
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:270 builtin/update-index.c:959
+#: builtin/add.c:283 builtin/update-index.c:948
msgid "override the executable bit of the listed files"
msgstr "ΠΏΠ΅ΡΠ΅ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π±ΠΈΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
"
-#: builtin/add.c:292
+#: builtin/add.c:305
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ -f, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΡ
.\n"
-#: builtin/add.c:300
+#: builtin/add.c:312
msgid "adding files failed"
msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/add.c:336
+#: builtin/add.c:348
msgid "-A and -u are mutually incompatible"
msgstr "-A ΠΈ -u Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
-#: builtin/add.c:343
+#: builtin/add.c:355
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "ΠΠΏΡΠΈΡ --ignore-missing ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --dry-run"
-#: builtin/add.c:352
+#: builtin/add.c:359
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --chmod «%s» Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ -x ΠΈΠ»ΠΈ +x"
-#: builtin/add.c:367
+#: builtin/add.c:374
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "ΠΠΈΡΠ΅Π³ΠΎ Π½Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ, Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ.\n"
-#: builtin/add.c:368
+#: builtin/add.c:375
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ «git add .»?\n"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: 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/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
+#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr "ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ «%s»"
-
-#: builtin/am.c:426
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΡΠ΅Π½Π°ΡΠΈΠΉ Π°Π²ΡΠΎΡΡΡΠ²Π°"
-#: builtin/am.c:503
+#: builtin/am.c:491
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "«%s» Π±ΡΠ» ΡΠ΄Π°Π»Π΅Π½ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠΎΠΌ applypatch-msg"
-#: builtin/am.c:544 builtin/notes.c:301
+#: builtin/am.c:532
#, c-format
msgid "Malformed input line: '%s'."
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° Π²Π²ΠΎΠ΄Π°: «%s»."
-#: builtin/am.c:581 builtin/notes.c:316
+#: builtin/am.c:569
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· «%s» Π² «%s»"
-#: builtin/am.c:607
+#: builtin/am.c:595
msgid "fseek failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ fseek"
-#: builtin/am.c:787
+#: builtin/am.c:775
#, c-format
msgid "could not parse patch '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΏΠ°ΡΡ «%s»"
-#: builtin/am.c:852
+#: builtin/am.c:840
msgid "Only one StGIT patch series can be applied at once"
msgstr "Π’ΠΎΠ»ΡΠΊΠΎ ΡΠ΅ΡΠΈΡ ΠΏΠ°ΡΡΠ΅ΠΉ StGIT ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π·Π° ΡΠ°Π·"
-#: builtin/am.c:899
+#: builtin/am.c:887
msgid "invalid timestamp"
msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΠΌΠ΅ΡΠΊΠ° Π΄Π°ΡΡ/Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ"
-#: builtin/am.c:902 builtin/am.c:910
+#: builtin/am.c:890 builtin/am.c:898
msgid "invalid Date line"
msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ° Π΄Π°ΡΡ"
-#: builtin/am.c:907
+#: builtin/am.c:895
msgid "invalid timezone offset"
msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΡΠΎΠ²ΠΎΠ³ΠΎ ΠΏΠΎΡΡΠ°"
-#: builtin/am.c:996
+#: builtin/am.c:984
msgid "Patch format detection failed."
msgstr "Π‘Π±ΠΎΠΉ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ ΡΠΎΡΠΌΠ°ΡΠ° ΠΏΠ°ΡΡΠ°."
-#: builtin/am.c:1001 builtin/clone.c:380
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
msgid "failed to create directory '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «%s»"
-#: builtin/am.c:1005
+#: builtin/am.c:993
msgid "Failed to split patches."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·Π΄Π΅Π»ΠΈΡΡ ΠΏΠ°ΡΡΠΈ Π½Π° ΡΠ°ΡΡΠΈ."
-#: builtin/am.c:1137 builtin/commit.c:366
+#: builtin/am.c:1125 builtin/commit.c:376
msgid "unable to write index file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/am.c:1188
+#: builtin/am.c:1176
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "ΠΠΎΠ³Π΄Π° Π²Ρ ΡΡΡΡΠ°Π½ΠΈΡΠ΅ ΡΡΡ ΠΏΡΠΎΠ±Π»Π΅ΠΌΡ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «%s --continue»."
-#: builtin/am.c:1189
+#: builtin/am.c:1177
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «%s --skip»."
-#: builtin/am.c:1190
+#: builtin/am.c:1178
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Π§ΡΠΎΠ±Ρ Π²Π΅ΡΠ½ΡΡΡΡΡ Π½Π° ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «%s --abort»."
-#: builtin/am.c:1328
+#: builtin/am.c:1316
msgid "Patch is empty. Was it split wrong?"
msgstr "ΠΠ°ΡΡ ΠΏΡΡΡ. ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΎΠ½ Π±ΡΠ» Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎ ΡΠ°Π·Π΄Π΅Π»ΡΠ½?"
-#: builtin/am.c:1402 builtin/log.c:1543
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
msgid "invalid ident line: %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1417
#, c-format
msgid "unable to parse commit %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s"
-#: builtin/am.c:1602
+#: builtin/am.c:1610
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Π ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ Π΄Π»Ρ ΠΎΡΠΊΠ°ΡΠ° ΠΊ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ."
-#: builtin/am.c:1604
+#: builtin/am.c:1612
msgid "Using index info to reconstruct a base tree..."
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π΄Π»Ρ ΡΠ΅ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΈΠΈ Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ Π΄Π΅ΡΠ΅Π²Π°…"
-#: builtin/am.c:1623
+#: builtin/am.c:1631
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr "ΠΡ Π²ΡΡΡΠ½ΡΡ ΠΈΠ·ΠΌΠ΅Π½ΡΠ»ΠΈ ΠΏΠ°ΡΡ?\nΠΠ½ Π½Π΅ Π½Π°ΠΊΠ»Π°Π΄ΡΠ²Π°Π΅ΡΡΡ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ Π½Π° Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠ΅ Π² Π΅Π³ΠΎ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅."
-#: builtin/am.c:1629
+#: builtin/am.c:1637
msgid "Falling back to patching base and 3-way merge..."
msgstr "ΠΡΠΊΠ°Ρ ΠΊ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊ Π±Π°Π·ΠΎΠ²ΠΎΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ…"
-#: builtin/am.c:1654
+#: builtin/am.c:1662
msgid "Failed to merge in the changes."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-#: builtin/am.c:1679 builtin/merge.c:628
+#: builtin/am.c:1686 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ"
-#: builtin/am.c:1686
+#: builtin/am.c:1693
msgid "applying to an empty history"
msgstr "ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΊ ΠΏΡΡΡΠΎΠΉ ΠΈΡΡΠΎΡΠΈΠΈ"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/am.c:1731 builtin/am.c:1735
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ½ΠΈΡΡ: %s Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ "
-#: builtin/am.c:1751
+#: builtin/am.c:1759
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅, Π±Π΅Π· stdin ΠΏΠΎΠ΄ΠΊΠ»ΡΡΠ΅Π½Π½ΠΎΠ³ΠΎ ΠΊ ΡΠ΅ΡΠΌΠΈΠ½Π°Π»Ρ."
-#: builtin/am.c:1756
+#: builtin/am.c:1764
msgid "Commit Body is:"
msgstr "Π’Π΅Π»ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
-#: builtin/am.c:1766
+#: builtin/am.c:1774
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "ΠΡΠΈΠΌΠ΅Π½ΠΈΡΡ? [y] - Π΄Π°/[n] - Π½Π΅Ρ/[e] - ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ/[v] - ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ ΠΏΠ°ΡΡ/[a] - ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π²ΡΡ: "
-#: builtin/am.c:1816
+#: builtin/am.c:1824
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "ΠΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΏΡΡΡΠΎΠΉ: Π½Π΅Π»ΡΠ·Ρ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΏΠ°ΡΡΠΈ (Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅: %s)"
-#: builtin/am.c:1853 builtin/am.c:1925
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
msgid "Applying: %.*s"
msgstr "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅: %.*s"
-#: builtin/am.c:1869
+#: builtin/am.c:1877
msgid "No changes -- Patch already applied."
msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ — ΠΠ°ΡΡ ΡΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½."
-#: builtin/am.c:1877
+#: builtin/am.c:1885
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π½Π° %s %.*s"
-#: builtin/am.c:1883
+#: builtin/am.c:1891
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "ΠΠΎΠΏΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ, Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π½Π°ΠΉΡΠΈ Π²: %s"
-#: builtin/am.c:1928
+#: builtin/am.c:1936
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ — Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Π²ΡΠ·Π²Π°ΡΡ «git add»?\nΠΡΠ»ΠΈ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ ΠΎΡΡΠ°Π»ΠΎΡΡ Π΄Π»Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠ°ΡΠΈΠΈ, ΡΠΎ, ΡΠΊΠΎΡΠ΅Π΅ Π²ΡΠ΅Π³ΠΎ, ΡΡΠΎ-ΡΠΎ Π΄ΡΡΠ³ΠΎΠ΅ ΡΠΆΠ΅ ΡΠ΄Π΅Π»Π°Π»ΠΎ ΡΠ΅ ΠΆΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ; Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Π°ΠΌ ΡΠ»Π΅Π΄ΡΠ΅Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ."
-#: builtin/am.c:1935
+#: builtin/am.c:1943
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr "Π£ Π²Π°Ρ Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Π²ΡΠ·Π²Π°ΡΡ «git add»?"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ «%s»."
-#: builtin/am.c:2095
+#: builtin/am.c:2103
msgid "failed to clean index"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΈΡΡΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/am.c:2129
+#: builtin/am.c:2137
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΠ»ΠΈ HEAD Ρ ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅ΠΉ ΠΎΡΠΈΠ±ΠΊΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ «am».\nΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π½Π° ORIG_HEAD Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ"
-#: builtin/am.c:2192
+#: builtin/am.c:2200
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ --patch-format: %s"
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] [(<mbox>|<Maildir>)…]"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] [(<mbox> | <Maildir>)…]"
-#: builtin/am.c:2226
+#: builtin/am.c:2234
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] (--continue | --skip | --abort)"
-#: builtin/am.c:2232
+#: builtin/am.c:2240
msgid "run interactively"
msgstr "Π·Π°ΠΏΡΡΡΠΈΡΡ Π² ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠΌ ΡΠ΅ΠΆΠΈΠΌΠ΅"
-#: builtin/am.c:2234
+#: builtin/am.c:2242
msgid "historical option -- no-op"
msgstr "ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΠΏΡΠΈΡ — Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ"
-#: builtin/am.c:2236
+#: builtin/am.c:2244
msgid "allow fall back on 3way merging if needed"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΎΡΠΊΠ°ΡΠΈΡΡΡΡ ΠΊ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΅ΡΠ»ΠΈ Π½ΡΠΆΠ½ΠΎ"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:172
msgid "be quiet"
msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ"
-#: builtin/am.c:2239
+#: builtin/am.c:2247
msgid "add a Signed-off-by line to the commit message"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΡΠΎΠΊΡ Signed-off-by ΠΊ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/am.c:2242
+#: builtin/am.c:2250
msgid "recode into utf8 (default)"
msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠΎΠ΄ΠΈΡΠΎΠ²Π°ΡΡ Π² utf8 (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/am.c:2244
+#: builtin/am.c:2252
msgid "pass -k flag to git-mailinfo"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -k Π² git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2254
msgid "pass -b flag to git-mailinfo"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -b Π² git-mailinfo"
-#: builtin/am.c:2248
+#: builtin/am.c:2256
msgid "pass -m flag to git-mailinfo"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -m Π² git-mailinfo"
-#: builtin/am.c:2250
+#: builtin/am.c:2258
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ --keep-cr Π² git-mailsplit Π΄Π»Ρ ΡΠΎΡΠΌΠ°ΡΠ° mbox"
-#: builtin/am.c:2253
+#: builtin/am.c:2261
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "Π½Π΅ ΠΏΠ΅ΡΠ΅Π΄Π°Π²Π°ΡΡ --keep-cr ΡΠ»Π°Π³ Π² git-mailsplit Π²Π½Π΅ Π·Π°Π²ΠΈΡΠΈΠΌΠΎΡΡΠΈ ΠΎΡ am.keepcr"
-#: builtin/am.c:2256
+#: builtin/am.c:2264
msgid "strip everything before a scissors line"
msgstr "ΠΎΠ±ΡΠ΅Π·Π°ΡΡ Π²ΡΠ΅ Π΄ΠΎ ΡΡΡΠΎΠΊΠΈ ΠΎΠ±ΡΠ΅Π·ΠΊΠΈ"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅"
-
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
+#: 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
msgid "pass it through git-apply"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ Π΅Π³ΠΎ Π² git-apply"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "ΠΊΠΎΡΠ΅Π½Ρ"
-
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "ΠΏΡΡΡ"
-
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ"
-
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "ΡΠΎΡΠΌΠ°Ρ"
-#: builtin/am.c:2282
+#: builtin/am.c:2290
msgid "format the patch(es) are in"
msgstr "ΡΠΎΡΠΌΠ°Ρ, Π² ΠΊΠΎΡΠΎΡΠΎΠΌ Π½Π°Ρ
ΠΎΠ΄ΡΡΡΡ ΠΏΠ°ΡΡΠΈ"
-#: builtin/am.c:2288
+#: builtin/am.c:2296
msgid "override error message when patch failure occurs"
msgstr "ΠΏΠ΅ΡΠ΅ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΠ± ΠΎΡΠΈΠ±ΠΊΠ΅, Π΅ΡΠ»ΠΈ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°Π»ΠΎΠΆΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ"
-#: builtin/am.c:2290
+#: builtin/am.c:2298
msgid "continue applying patches after resolving a conflict"
msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ»ΠΈΠΊΡΠ°"
-#: builtin/am.c:2293
+#: builtin/am.c:2301
msgid "synonyms for --continue"
msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --continue"
-#: builtin/am.c:2296
+#: builtin/am.c:2304
msgid "skip the current patch"
msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΏΠ°ΡΡ"
-#: builtin/am.c:2299
+#: builtin/am.c:2307
msgid "restore the original branch and abort the patching operation."
msgstr "Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ."
-#: builtin/am.c:2303
+#: builtin/am.c:2311
msgid "lie about committer date"
msgstr "ΡΠΎΠ²ΡΠ°ΡΡ ΠΎ Π΄Π°ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°"
-#: builtin/am.c:2305
+#: builtin/am.c:2313
msgid "use current timestamp for author date"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ Π²ΡΠ΅ΠΌΡ ΠΊΠ°ΠΊ Π²ΡΠ΅ΠΌΡ Π°Π²ΡΠΎΡΡΡΠ²Π°"
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2308
+#: builtin/am.c:2316
msgid "GPG-sign commits"
msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG"
-#: builtin/am.c:2311
+#: builtin/am.c:2319
msgid "(internal use for git-rebase)"
msgstr "(Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ Π΄Π»Ρ git-rebase)"
-#: builtin/am.c:2326
+#: builtin/am.c:2334
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr "ΠΠΏΡΠΈΡ -b/--binary ΡΠΆΠ΅ Π΄ΠΎΠ»Π³ΠΎΠ΅ Π²ΡΠ΅ΠΌΡ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ ΠΈ Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½Π° Ρ ΡΠ»Π΅Π΄ΡΡΡΠΈΡ
Π²Π΅ΡΡΠΈΡΡ
Git. ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π΅Π΅."
-#: builtin/am.c:2333
+#: builtin/am.c:2341
msgid "failed to read the index"
msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: builtin/am.c:2348
+#: builtin/am.c:2356
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ %s Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ, Π½ΠΎ ΠΏΠ΅ΡΠ΅Π΄Π°Π½ mbox."
-#: builtin/am.c:2372
+#: builtin/am.c:2380
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr "ΠΠ°ΠΉΠ΄Π΅Π½ Π·Π°Π±ΡΡΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ %s.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «git am --abort», ΡΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ."
-#: builtin/am.c:2378
+#: builtin/am.c:2386
msgid "Resolve operation not in progress, we are not resuming."
msgstr "ΠΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² Π½Π΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ, Π½Π΅ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ."
-#: builtin/apply.c:122
+#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<ΠΎΠΏΡΠΈΠΈ>] [<ΠΏΠ°ΡΡ>…]"
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² «%s»"
-
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² «%s»"
-
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΈΡΡ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΎΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΌΠ΅ΡΠΊΠΈ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ %s"
-
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΠ» %d Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°: %s"
-
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² ΡΡΡΠΎΠΊΠ΅ ΠΏΠ°ΡΡΠ° %d"
-
-#: builtin/apply.c:984
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ Π½ΠΎΠ²ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ ΡΡΠ°ΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff — ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: Π½Π΅ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ°: %.*s"
-
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "ΡΡΠ°Π³ΠΌΠ΅Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π΅Π· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s"
-
-#: builtin/apply.c:1567
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname"
-" component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname"
-" components (line %d)"
-msgstr[0] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½ΡΠ° ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
-msgstr[1] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
-msgstr[2] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
-msgstr[3] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)"
-
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ"
-
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅"
-
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "ΠΏΠ°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» %s Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ"
-
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» %s Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅"
-
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠ°ΠΉΠ» %s ΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡ ΠΏΡΡΡΡΠΌ, Π½ΠΎ Π½Π΅ ΡΠ΄Π°Π»ΡΠ΅ΡΡΡ"
-
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s"
-
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "ΠΏΠ°ΡΡ Ρ ΠΌΡΡΠΎΡΠΎΠΌ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d"
-
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s"
-
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΡΡ %s"
-
-#: builtin/apply.c:2901
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π½Π°ΡΠ°Π»ΠΎ ΡΡΡΠΎΠΊΠΈ: «%c»"
-
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΡ)."
-msgstr[1] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΠΈ)."
-msgstr[2] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)."
-msgstr[3] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)."
-
-#: builtin/apply.c:3032
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "ΠΠΎΠ½ΡΠ΅ΠΊΡΡ ΡΡΠΆΠ΅Π½ Π΄ΠΎ (%ld/%ld), ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΡΠ°Π³ΠΌΠ΅Π½Ρ Π½Π° %d ΡΡΡΠΎΠΊΠ΅"
-
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr "ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅:\n%.*s"
-
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "ΠΏΡΠΎΠΏΡΡΠ΅Π½Ρ Π΄Π°Π½Π½ΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ «%s»"
-
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ ΠΊ «%s»"
-
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "ΠΏΠΎΡΠ»Π΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ «%s» Π±ΡΠ» ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ (ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s)"
-
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: %s:%ld"
-
-#: builtin/apply.c:3314
-#, c-format
-msgid "cannot checkout %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° %s"
-
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "ΡΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· «%s» Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ"
-
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "ΠΏΡΡΡ %s Π±ΡΠ» ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½/ΡΠ΄Π°Π»Π΅Π½"
-
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: Π½Π΅Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
-
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: builtin/apply.c:3491 builtin/apply.c:3652
-#, c-format
-msgid "%s: does not match index"
-msgstr "%s: Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ"
-
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "ΠΏΠ°ΡΡ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ ΡΠ΄Π°Π»ΠΈΠ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π°"
-
-#: builtin/apply.c:3669
-#, c-format
-msgid "%s: wrong type"
-msgstr "%s: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΈΠΏ"
-
-#: builtin/apply.c:3671
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s ΠΈΠΌΠ΅Π΅Ρ ΡΠΈΠΏ %o, Π° ΠΎΠΆΠΈΠ΄Π°Π»ΡΡ %o"
-
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΡΡΡ «%s»"
-
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
-
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o)"
-
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s"
-
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "Π·Π°ΡΡΠΎΠ½ΡΡΡΠΉ ΡΠ°ΠΉΠ» «%s» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ"
-
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ"
-
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΠ°ΡΡΠ° %s…"
-
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "ΡΠ±ΠΎΠΉ make_cache_entry Π΄Π»Ρ ΠΏΡΡΠΈ «%s»"
-
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ ΠΏΠ°ΡΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s"
-
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° «%s»"
-
-#: builtin/apply.c:4224
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %s"
-
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΊΡΡΠ΅ Π΄Π»Ρ %s"
-
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "Π·Π°ΠΊΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Π° «%s»"
-
-#: builtin/apply.c:4313
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» «%s» Ρ ΡΠ΅ΠΆΠΈΠΌΠΎΠΌ Π΄ΠΎΡΡΡΠΏΠ° %o"
-
-#: builtin/apply.c:4403
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "ΠΠ°ΡΡ %s ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ."
-
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°"
-
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·ΠΎΠΌ…"
-msgstr[1] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈ…"
-msgstr[2] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈ…"
-msgstr[3] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈ…"
-
-#: builtin/apply.c:4424
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "ΡΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠΌΠ΅Π½ΠΈ .rej ΡΠ°ΠΉΠ»Π° Π΄ΠΎ %.*s.rej"
-
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s: %s"
-
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "ΠΠ»ΠΎΠΊ β%d ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ."
-
-#: builtin/apply.c:4448
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr "ΠΠ»ΠΎΠΊ β%d ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½."
-
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "ΠΠ°ΡΡ «%s» ΠΏΡΠΎΠΏΡΡΠ΅Π½."
-
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π²Π²ΠΎΠ΄"
-
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΏΠ°ΡΡ «%s»"
-
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° %d ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
-msgstr[1] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
-msgstr[2] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
-msgstr[3] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
-
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d ΡΡΡΠΎΠΊΠ° Π΄ΠΎΠ±Π°Π²ΠΈΠ»Π° ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
-msgstr[1] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
-msgstr[2] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
-msgstr[3] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
."
-
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ"
-
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ"
-
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "ΡΠ΄Π°Π»ΠΈΡΡ <ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ> Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΡΡΡ
ΡΠ΅ΡΡ ΠΈΠ· ΡΡΠ°Π΄ΠΈΡΠΈΠΎΠ½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΡΠΏΠΈΡΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ, ΡΠ΄Π΅Π»Π°Π½Π½ΡΠ΅ ΡΡΠΈΠΌ ΠΏΠ°ΡΡΠ΅ΠΌ"
-
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΉ ΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°"
-
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
ΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΡΡΡΠΎΠΊ Π² Π΄Π΅ΡΡΡΠΈΡΠ½ΠΎΠΌ ΠΏΡΠ΅Π΄ΡΡΠ°Π²Π»Π΅Π½ΠΈΠΈ"
-
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°"
-
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ Π»ΠΈ ΠΎΠ½"
-
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΡΠ΅ΠΊΡΡΠ΅ΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΡ"
-
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ, Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³"
-
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "ΠΏΡΠΈΠ½ΡΡΡ ΠΏΠ°ΡΡ, ΠΊΠΎΡΠΎΡΡΠΉ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Π΅Ρ ΡΠ°ΠΉΠ»Ρ Π·Π° ΡΠ°Π±ΠΎΡΠΈΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ"
-
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "Π° ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Ρ --stat/--summary/--check)"
-
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "ΠΏΠΎΠΏΡΡΠ°ΡΡΡΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π΅ΡΠ»ΠΈ ΠΏΠ°ΡΡ Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ"
-
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr "ΠΏΠΎΡΡΡΠΎΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΠΉ Π½Π° Π²ΡΡΡΠΎΠ΅Π½Π½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
-
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "ΠΏΡΡΠΈ, ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠ΅ ΠΠ£ΠΠΠΠ«Π ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠΌ"
-
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΠΎ ΠΊΡΠ°ΠΉΠ½Π΅ΠΉ ΠΌΠ΅ΡΠ΅ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ"
-
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΠΈΠ»ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Ρ ΠΊΠΎΡΠΎΡΡΡ
Π΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
"
-
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°"
-
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ Ρ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "Π½Π΅ ΠΎΠΆΠΈΠ΄Π°ΡΡ ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ ΠΎΠ΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°"
-
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½Π½ΡΠ΅ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΡ
*.rej ΡΠ°ΠΉΠ»Π°Ρ
"
-
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΊΡΡΠ²Π°ΡΡΠΈΠ΅ΡΡ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π½Π΅ΠΊΠΎΡΡΠ΅ΠΊΡΠ½ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π½ΡΠ΅ ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ Π² ΠΊΠΎΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Π°"
-
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr "Π½Π΅ Π΄ΠΎΠ²Π΅ΡΡΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΡΡΡΠΎΠΊ ΠΈΠ· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π±Π»ΠΎΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ <ΠΊΠΎΡΠ΅Π½Ρ> ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊΠΎ Π²ΡΠ΅ΠΌ ΠΈΠΌΠ΅Π½Π°ΠΌ ΡΠ°ΠΉΠ»ΠΎΠ²"
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3860,112 +4306,160 @@
msgid "Blaming lines"
msgstr "ΠΡΠΎΡΠΌΠΎΡΡ Π°Π²ΡΠΎΡΠΎΠ² ΡΡΡΠΎΠΊ"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π·Π°ΠΏΠΈΡΠΈ Π°Π²ΡΠΎΡΡΡΠ²Π° ΠΏΠΎΡΡΠ΅ΠΏΠ΅Π½Π½ΠΎ, Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π½Π°Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΡ"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ SHA-1 Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ², Π½Π΅ Π²Ρ
ΠΎΠ΄ΡΡΠΈΡ
Π² Π³ΡΠ°Π½ΠΈΡΡ Π·Π°ΠΏΡΠΎΡΠ° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "ΠΠ΅ Π²ΠΎΡΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΊΠ°ΠΊ Π³ΡΠ°Π½ΠΈΡΠ½ΡΠ΅ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΡΠ°ΡΡ
ΠΎΠ΄ΠΎΠ² Π½Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ Π·Π°ΠΏΡΠΎΡΠ°"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "ΠΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠ΅Π½ΠΊΡ Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠ΅ΠΉ Π°Π²ΡΠΎΡΡΡΠ²Π°"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ Π½ΠΎΠΌΠ΅ΡΠ° ΡΡΡΠΎΠΊ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ Π΄Π»Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ½ΠΎΠ³ΠΎ ΡΠ°Π·Π±ΠΎΡΠ°"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π² ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅, Ρ ΠΏΠΎΡΡΡΠΎΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠ΅ΠΉ ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ΅"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΠΊΠΎΠΉ ΠΆΠ΅ ΡΠΎΡΠΌΠ°Ρ Π²ΡΠ²ΠΎΠ΄Π°, ΠΊΠ°ΠΊ ΠΈ git-annotate (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠ΅ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π΄Π»ΠΈΠ½Π½ΡΠΉ SHA1 ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠΌΡ Π°Π²ΡΠΎΡΠ° ΠΈ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΠΎΡΡΡ Π°Π²ΡΠΎΡΠ° Π²ΠΌΠ΅ΡΡΠΎ ΠΈΠΌΠ΅Π½ΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "ΠΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΡΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½ΡΠ°Π»ΡΠ½ΡΡ ΡΠ²ΡΠΈΡΡΠΈΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΡ Π½Π° ΠΎΡΡΡΡΠΏΠ°Ρ
, ΡΡΠΎΠ±Ρ ΡΠ»ΡΡΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΡΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½ΡΠ°Π»ΡΠ½ΡΡ ΡΠ²ΡΠΈΡΡΠΈΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΡ Π½Π° ΠΏΡΡΡΡΡ
ΡΡΡΠΎΠΊΠ°Ρ
, ΡΡΠΎΠ±Ρ ΡΠ»ΡΡΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr "ΠΠΎΡΡΠ°ΡΠΈΡΡ Π±ΠΎΠ»ΡΡΠ΅ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ, Π΄Π»Ρ Π½Π°Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΡ Π»ΡΡΡΠΈΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΈΠ· <ΡΠ°ΠΉΠ»Π°> Π²ΠΌΠ΅ΡΡΠΎ Π²ΡΠ·ΠΎΠ²Π° git-rev-list"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ <ΡΠ°ΠΉΠ»Π°> ΠΊΠ°ΠΊ ΡΠΈΠ½Π°Π»ΡΠ½ΡΠΉ ΡΠ½ΠΈΠΌΠΎΠΊ"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "ΠΌΠΈΠ½-Π΄Π»ΠΈΠ½Π°"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "ΠΠ°ΠΉΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΡΡΡΠΎΠΊ Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
ΠΈ ΠΌΠ΅ΠΆΠ΄Ρ ΡΠ°ΠΉΠ»Π°ΠΌΠΈ"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "ΠΠ°ΠΉΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΡΡΡΠΎΠΊ Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
ΠΈ ΠΌΠ΅ΠΆΠ΄Ρ ΡΠ°ΠΉΠ»Π°ΠΌΠΈ"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "Π½Π°ΡΠ°Π»ΠΎ,ΠΊΠΎΠ½Π΅Ρ"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠΎΠΊΠΈ Π² Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½Π΅ Π½Π°ΡΠ°Π»ΠΎ,ΠΊΠΎΠ½Π΅Ρ, Π½Π°ΡΠΈΠ½Π°Ρ Ρ 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --incremental ΠΈΠ»ΠΈ ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΡΠΌ (porcelain) ΡΠΎΡΠΌΠ°ΡΠΎΠΌ"
+
#. TRANSLATORS: This string is used to tell us the maximum
#. display width for a relative timestamp in "git blame"
#. output. For C locale, "4 years, 11 months ago", which
#. 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:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "4 Π³ΠΎΠ΄Π° ΠΈ 11 ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents ΠΈ --reverse Π½Π΅ ΠΎΡΠ΅Π½Ρ ΡΠΎΡΠ΅ΡΠ°ΡΡΡΡ."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ --contents Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΡΠΈΠ½Π°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΈΠΌΠ΅Π½ΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "ΠΏΡΠΈ --reverse ΠΈ --first-parent Π²ΠΌΠ΅ΡΡΠ΅ Π½ΡΠΆΠ½ΠΎ ΡΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΊΠΎΠ½ΠΊΡΠ΅ΡΠ½ΡΠΉ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ --reverse ΠΈ --first-parent Π²ΠΌΠ΅ΡΡΠ΅, ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ°ΠΊΠΆΠ΅ ΡΠΊΠ°Π·Π°ΡΡ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ ΠΏΠΎ ΡΠ΅ΠΏΠΎΡΠΊΠ΅ ΠΏΠ΅ΡΠ²ΠΎΠ³ΠΎ ΡΠΎΠ΄ΠΈΡΠ΅Π»Ρ"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ ΠΏΡΡΠΈ %s Π² %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s Π΄Π»Ρ ΠΏΡΡΠΈ %s"
+
+#: builtin/blame.c:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊΡ"
+msgstr[1] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊΠΈ"
+msgstr[2] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊ"
+msgstr[3] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊΠΈ"
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] [-r | -a] [--merged | --no-merged]"
@@ -4204,6 +4698,10 @@
msgid "change the upstream info"
msgstr "ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Π£Π±ΡΠ°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ²Π΅ΡΠ½ΠΎΠΉ Π²ΡΠ²ΠΎΠ΄"
@@ -4276,8 +4774,8 @@
msgid "field name to sort on"
msgstr "ΠΈΠΌΡ ΠΏΠΎΠ»Ρ, ΠΏΠΎ ΠΊΠΎΡΠΎΡΠΎΠΌΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠΎΡΡΠΈΡΠΎΠ²ΠΊΡ"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 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:369
msgid "object"
msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ"
@@ -4290,7 +4788,7 @@
msgid "Failed to resolve HEAD as a valid ref."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD ΠΊΠ°ΠΊ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² refs/heads!"
@@ -4393,61 +4891,75 @@
msgid "Need a repository to unbundle."
msgstr "Π’ΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-"
-"type]|-e|-p|<type>|--textconv) <object>"
-msgstr "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<ΡΠΈΠΏ>|--textconv) <ΠΎΠ±ΡΠ΅ΠΊΡ>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+"-p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <ΡΠΈΠΏ> | --textconv | --filters) [--path=<ΠΏΡΡΡ>] <ΠΎΠ±ΡΠ΅ΠΊΡ>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
+"--filters]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<ΡΠΈΠΏ> ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ·: blob, tree, commit, tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ°"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠ°Π·ΠΌΠ΅Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ°"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr "Π²ΡΠΉΡΠΈ Ρ Π½ΡΠ»Π΅Π²ΡΠΌ ΠΊΠΎΠ΄ΠΎΠΌ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°, Π΅ΡΠ»ΠΈ Π½Π΅Ρ ΠΎΡΠΈΠ±ΠΊΠΈ"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "ΡΡΡΡΠΊΡΡΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠΉ Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ°"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr "Π·Π°ΠΏΡΡΡΠΈΡΡ texconv Π½Π° ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² "
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "Π·Π°ΠΏΡΡΠΊ ΡΠΈΠ»ΡΡΡΠΎΠ² Π½Π° ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² "
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr "Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠΉ ΠΏΡΡΡ Π΄Π»Ρ --textconv/--filters"
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ -s ΠΈ -t ΡΠ°Π±ΠΎΡΠ°ΡΡ Ρ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½Π½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ"
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "Π±ΡΡΡΠ΅ΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ²ΠΎΠ΄ --batch"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ², ΠΏΠ΅ΡΠ΅Π΄Π°Π½Π½ΡΡ
ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΎΠ±ΡΠ΅ΠΊΡΠ°Ρ
, ΠΏΠ΅ΡΠ΅Π΄Π°Π½Π½ΡΡ
ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ΠΈΡΡ ΠΏΠΎ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΠΌ ΡΡΡΠ»ΠΊΠ°ΠΌ Π²Π½ΡΡΡΠΈ Π΄Π΅ΡΠ΅Π²Π° (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --batch ΠΈ --batch-check)"
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π²ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --batch ΠΈΠ»ΠΈ --batch-check"
@@ -4467,7 +4979,7 @@
msgid "use .gitattributes only from the index"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ .gitattributes ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
@@ -4475,7 +4987,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ Π²Π²ΠΎΠ΄Π° ΠΈ Π²ΡΠ²ΠΎΠ΄Π° Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΏΠΎ ΠΠ£ΠΠΠΠΠΠ£ ΡΠΈΠΌΠ²ΠΎΠ»Ρ"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ"
@@ -4565,9 +5077,9 @@
msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π²ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "ΡΡΡΠΎΠΊΠ°"
@@ -4638,54 +5150,54 @@
msgid "path '%s' is unmerged"
msgstr "ΠΏΡΡΡ «%s» Π½Π΅ ΡΠ»ΠΈΡ"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "ΡΠ½Π°ΡΠ°Π»Π° Π½ΡΠΆΠ½ΠΎ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² Π²Π°ΡΠ΅ΠΌ ΡΠ΅ΠΊΡΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π΄Π»Ρ «%s»: %s\n"
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD ΡΠ΅ΠΉΡΠ°Ρ Π½Π°"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Π‘Π±ΡΠΎΡ Π²Π΅ΡΠΊΠΈ «%s»\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Π£ΠΆΠ΅ Π½Π° «%s»\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΠΈ ΡΠ±ΡΠΎΡ Π²Π΅ΡΠΊΠΈ «%s»\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ «%s»\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π½Π° Π²Π΅ΡΠΊΡ «%s»\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " … ΠΈ Π΅ΡΠ΅ %d.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4702,7 +5214,7 @@
msgstr[2] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠ΅ Π½ΠΈ Ρ ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π°ΡΠΈΡ
Π²Π΅ΡΠΎΠΊ:\n\n%s\n"
msgstr[3] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠ΅ Π½ΠΈ Ρ ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π°ΡΠΈΡ
Π²Π΅ΡΠΎΠΊ:\n\n%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4721,162 +5233,162 @@
msgstr[2] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ, ΡΠΎ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°ΠΌΠΎΠ΅ Π²ΡΠ΅ΠΌΡ\nΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ:\n\n git branch <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ> %s\n"
msgstr[3] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ, ΡΠΎ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°ΠΌΠΎΠ΅ Π²ΡΠ΅ΠΌΡ\nΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ:\n\n git branch <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ> %s\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΠΈ ΠΏΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΌ"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "ΠΡΠ΅Π΄ΡΠ΄ΡΡΠ°Ρ ΠΏΠΎΠ·ΠΈΡΠΈΡ HEAD Π±ΡΠ»Π°"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "ΠΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π½Π° Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠΉ Π²Π΅ΡΠΊΠ΅"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΡΡΡΠ»ΠΊΠ°, Π° ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ %d."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ°: %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "Π² Π΄Π΅ΡΠ΅Π²Π΅ Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ: %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΡΠΈ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΎΠΊ"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ «%s» ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΎΠΊ"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ «%s»"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ Π²Π΅ΡΠΊΡ Π½Π° Π½Π΅ ΠΊΠΎΠΌΠΌΠΈΡ «%s»"
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "Π²Π΅ΡΠΊΠ°"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "ΡΠΎΠ·Π΄Π°ΡΡ/ΡΠ±ΡΠΎΡΠΈΡΡ ΠΈ ΠΏΠ΅ΡΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π΄Π»Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ HEAD Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ΅"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅ Π΄Π»Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "Π½ΠΎΠ²Π°Ρ-Π²Π΅ΡΠΊΠ°"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "Π½ΠΎΠ²Π°Ρ Π²Π΅ΡΠΊΠ° Π±Π΅Π· ΡΠΎΠ΄ΠΈΡΠ΅Π»Π΅ΠΉ"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½Π°ΡΡ Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΠΈΡ
Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ (ΠΎΡΠ±ΡΠ°ΡΡΠ²Π°Π΅Ρ Π²ΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΎΠΉ"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "ΡΡΠΈΠ»Ρ"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "ΡΡΠΈΠ»Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² ΡΠ»ΠΈΡΠ½ΠΈΡ (merge ΠΈΠ»ΠΈ diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "Π½Π΅ ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΠ²Π°ΡΡ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΡ ΠΏΡΡΠΈ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌΠΈ Π·Π°ΠΏΠΈΡΡΠΌΠΈ"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "ΠΏΠ΅ΡΠ΅ΡΠΌΠΎΡΡ «git checkout <Π½Π΅Ρ-ΡΠ°ΠΊΠΎΠΉ-Π²Π΅ΡΠΊΠΈ>»"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr "Π½Π΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ, ΡΡΠΎ Π΄ΡΡΠ³ΠΎΠ΅ Π΄Π΅ΡΠ΅Π²ΠΎ ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ ΡΡΡΠ»ΠΊΡ"
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B ΠΈ --orphan Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track ΡΡΠ΅Π±ΡΠ΅Ρ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "ΠΡΠΎΠΏΡΡΠ΅Π½ΠΎ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ; ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΏΡΡΠΈ ΠΈ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π²Π΅ΡΠΊΡ «%s».\nΠΡ Ρ
ΠΎΡΠ΅Π»ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° «%s», ΡΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΎ ΠΊΠ°ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach Π½Π΅ ΠΏΡΠΈΠ½ΠΈΠΌΠ°Π΅Ρ ΠΏΡΡΡ «%s» ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ"
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5008,8 +5520,8 @@
msgid "remove whole directories"
msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "ΡΠ°Π±Π»ΠΎΠ½"
@@ -5045,290 +5557,306 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<ΠΎΠΏΡΠΈΠΈ>] [--] <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "Π½Π΅ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ°ΡΡ ΡΠ°Π±ΠΎΡΡΡ ΠΊΠΎΠΏΠΈΡ Π½Π° HEAD"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π³ΠΎΠ»ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π·Π΅ΡΠΊΠ°Π»ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ (Π²ΠΊΠ»ΡΡΠ°Π΅Ρ Π² ΡΠ΅Π±Ρ ΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ bare)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ· Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "Π½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΆΠ΅ΡΡΠΊΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π²ΡΠ΅Π³Π΄Π° ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "Π½Π°ΡΡΡΠΎΠΈΡΡ ΠΊΠ°ΠΊ ΠΎΠ±ΡΠ΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π² ΠΊΠ»ΠΎΠ½Π΅"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³-ΡΠ°Π±Π»ΠΎΠ½ΠΎΠ²"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³, ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΎΠ³ΠΎ Π±ΡΠ΄ΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½Ρ"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ --reference ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "ΠΈΠΌΡ"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΠΈΠΌΡ> Π²ΠΌΠ΅ΡΡΠΎ «origin» Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° <Π²Π΅ΡΠΊΡ>, Π²ΠΌΠ΅ΡΡΠΎ HEAD Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "ΠΏΡΡΡ ΠΊ git-upload-pack Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "Π³Π»ΡΠ±ΠΈΠ½Π°"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ Π³Π»ΡΠ±ΠΈΠ½Ρ"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "Π²ΡΠ΅ΠΌΡ"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ Π΄ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "ΡΠ΅Π΄Π°ΠΊΡΠΈΡ"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr "ΡΠ³Π»ΡΠ±ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π° ΠΈΡΠΊΠ»ΡΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Ρ Π²Π΅ΡΠΊΡ, HEAD ΠΈΠ»ΠΈ --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "Π²ΡΠ΅ ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π±ΡΠ΄ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌΠΈ ΠΊΠ»ΠΎΠ½Π°ΠΌΠΈ"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³-git"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "ΡΠ°Π·ΠΌΠ΅ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git ΠΎΡΠ΄Π΅Π»ΡΠ½ΠΎ ΠΎΡ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "ΠΊΠ»ΡΡ=Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π²Π½ΡΡΡΠΈ Π½ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ IPv4 Π°Π΄ΡΠ΅ΡΠ°"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ IPv6 Π°Π΄ΡΠ΅ΡΠ°"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr "ΠΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΡΠ³Π°Π΄Π°Π½ΠΎ.\nΠ£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΈΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ"
-#: builtin/clone.c:307
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» ΠΊΠ°ΠΊ ΡΠ²ΡΠ·Π°Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅, ΠΏΠΎΠΊΠ° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ."
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ: ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Ρ Π΄Π»Ρ «%s»: %s\n"
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌ."
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ"
-
-#: builtin/clone.c:317
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΠ°ΡΠ΅Π½Π½ΡΠΌ"
-
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s»"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΡΡΠ»ΠΊΡ «%s»"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» Π² «%s»"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "Π³ΠΎΡΠΎΠ²ΠΎ.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ, Π½ΠΎ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ°.\nΠ‘ ΠΏΠΎΠΌΠΎΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ «git status» Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ, ΠΊΠ°ΠΊΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π±ΡΠ»ΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Ρ, Π° ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ ΠΏΠΎΠΏΡΡΠΊΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Π½Π° Π²Π΅ΡΠΊΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git checkout -f HEAD»\n"
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ %s Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ."
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΏΡΠΈΡΠ»Π°Π» Π½Π΅ Π²ΡΠ΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD ΡΡΡΠ»Π°Π΅ΡΡΡ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΡΡ ΡΡΡΠ»ΠΊΡ, Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠ°ΠΊΡΡ Π²Π΅ΡΡΠΈΡ.\n"
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π² ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΏΠ°ΠΊΠΎΠ²ΠΊΡ Π΄Π»Ρ ΠΎΡΠΈΡΡΠΊΠΈ"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Π‘Π»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΎΠ²."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare ΠΈ --origin %s Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare ΠΈ --separate-git-dir Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "Π³Π»ΡΠ±ΠΈΠ½Π° %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠΈΡΠ»ΠΎΠΌ"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "ΡΠ΅Π»Π΅Π²ΠΎΠΉ ΠΏΡΡΡ «%s» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΡΡΡΡΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ."
-#: builtin/clone.c:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «%s» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠ΅ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ Π΄Π»Ρ «%s»"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «%s»"
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² Π³ΠΎΠ»ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ «%s»…\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² «%s»…\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
+msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠΌ --recursive Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Π½ΠΈ Ρ --reference, Π½ΠΈ Ρ --reference-if-able"
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file://."
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file:// Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ."
+
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file:// Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ."
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr "ΠΈΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ, --local ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "ΠΠ΅ Π·Π½Π°Ρ ΠΊΠ°ΠΊ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ΠΠ½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΠ° %s Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π² Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ %s"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π»ΠΈ ΠΏΡΡΡΠΎΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ."
@@ -5431,103 +5959,103 @@
"the remaining commits.\n"
msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡ ΡΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ:\n\n git reset\n\nΠΠΎΡΠ»Π΅ ΡΡΠΎΠ³ΠΎ «git cherry-pick --continue» ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΎΡΡΠ°Π²ΡΠΈΡ
ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ².\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "ΡΠ±ΠΎΠΉ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π΄Π΅ΡΠ΅Π²Π° HEAD"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ³ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΠΎΡΠ½ΠΎΠ²Π½ΠΎΠ³ΠΎ ΠΊΡΡΠ° Π΄Π΅ΡΠ΅Π²Π°"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° «%s» ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ Π°Π²ΡΠΎΡ Π² Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅"
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° «%s» ΡΡΡΠΎΠΊΠ° Π°Π²ΡΠΎΡΠ° Π² Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅"
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --author Π² Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΎΡΠΌΠ°Ρ Π΄Π°ΡΡ: %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "Π½Π΅Π»ΡΠ·Ρ Π²ΡΠ±ΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ» ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠ°ΡΠΈΡ, ΠΊΠΎΡΠΎΡΡΠΉ\nΠ½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ Π² ΡΠ΅ΠΊΡΡΠ΅ΠΌ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΠΎΡΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(ΡΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΆΡΡΠ½Π°Π»Π° ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΆΡΡΠ½Π°Π»Π° ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΆΡΡΠ½Π°Π»Π° «%s»"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½ ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5537,7 +6065,7 @@
"and try again.\n"
msgstr "\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΡΡΠ°Π΅ΡΠ΅ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅.\nΠΡΠ»ΠΈ ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠ°, ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ° ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ»\n\t%s\nΠΈ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5547,14 +6075,14 @@
"and try again.\n"
msgstr "\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΡΡΠ°Π΅ΡΠ΅ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΏΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\nΠΡΠ»ΠΈ ΡΡΠΎ Π½Π΅ ΡΠ°ΠΊ, ΡΠΎ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ»\n\t%s\nΠΈ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²Π²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ. Π‘ΡΡΠΎΠΊΠΈ,\nΠ½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ «%c» Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ, Π° ΠΏΡΡΡΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅\nΠΎΡΠΌΠ΅Π½ΡΠ΅Ρ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5562,341 +6090,345 @@
"An empty message aborts the commit.\n"
msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²Π²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ. Π‘ΡΡΠΎΠΊΠΈ,\nΠ½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ «%c» Π±ΡΠ΄ΡΡ ΠΎΡΡΠ°Π²Π»Π΅Π½Ρ; Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ ΠΈΡ
Π²ΡΡΡΠ½ΡΡ,\nΠ΅ΡΠ»ΠΈ Ρ
ΠΎΡΠΈΡΠ΅. ΠΡΡΡΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡΠΌΠ΅Π½ΡΠ΅Ρ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n"
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sΠΠ²ΡΠΎΡ: %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sΠΠ°ΡΠ°: %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sΠΠΎΠΌΠΌΠΈΡΠ΅Ρ: %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΡΡΡΠΎΠ΅Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²ΡΠ΅Π²"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅, ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΠΎΠΏΡΠΈΠΉ -m ΠΈΠ»ΠΈ -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» Π½Π΅ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ «ΠΠΌΡ <ΠΏΠΎΡΡΠ°>» ΠΈ Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΌ Π°Π²ΡΠΎΡΠΎΠΌ"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² «%s»"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long ΠΈ -z Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΎΠΏΡΠΈΠΉ --reset-author ΠΈ --author Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°"
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "ΠΠ΅ΡΠ΅Π³ΠΎ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ — ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° — ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr "ΠΠΏΡΠΈΠΈ --squash ΠΈ --fixup Π½Π΅ ΠΌΠΎΠ³ΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "ΠΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΠΈΠ· ΠΎΠΏΡΠΈΠΉ -c/-C/-F/--fixup."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "ΠΠΏΡΠΈΡ -m Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Ρ -c/-C/-F/--fixup."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ -C, -c ΠΈΠ»ΠΈ --amend."
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "ΠΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΠΈΠ· ΠΎΠΏΡΠΈΠΉ --include/--only/--all/--interactive/--patch."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΏΡΡΠ΅ΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --include/--only Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Π£ΠΌΠ½ΠΎ… ΠΎΡΠΌΠ΅Π½Π° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅Π³ΠΎ Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "ΠΡΡΠΈ ΡΠ²Π½ΠΎ ΡΠΊΠ°Π·Π°Π½Ρ ΠΏΡΡΠΈ Π±Π΅Π· ΠΎΠΏΡΠΈΠΉ -i ΠΈΠ»ΠΈ -o; ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Ρ ΠΎΠΏΡΠΈΡ --only…"
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΡΠΈΡΡΠΊΠΈ %s"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Π‘ ΠΎΠΏΡΠΈΠ΅ΠΉ -a ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΏΡΡΠΈ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°."
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "ΠΊΡΠ°ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΡΡ"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²Π΅ΡΡΠΈΠΈ"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "Π²Π΅ΡΡΠΈΡ"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΡΠΉ Π²ΡΠ²ΠΎΠ΄"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΡΡ Π² Π΄Π»ΠΈΠ½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "Π·Π°Π²Π΅ΡΡΠ°ΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΠ£ΠΠΠΠ«Π Π±Π°ΠΉΡΠΎΠΌ"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "ΡΠ΅ΠΆΠΈΠΌ"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ, ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΡΠ΅ ΡΠ΅ΠΆΠΈΠΌΡ: all (Π²ΡΠ΅), normal (ΠΊΠ°ΠΊ ΠΎΠ±ΡΡΠ½ΠΎ), no (Π½Π΅Ρ). (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: all)"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "ΠΊΠΎΠ³Π΄Π°"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
, ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΠΎ ΠΊΠΎΠ³Π΄Π°: all (Π²ΡΠ΅Π³Π΄Π°), dirty (ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅), untracked (Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅). (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΠΎ ΡΡΠΎΠ»Π±ΡΠ°ΠΌ"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "Π½Π΅Π»ΡΠ·Ρ Π·Π°ΠΏΡΠΎΡΠΈΡΡ Π½ΠΎΠ²ΠΎΡΠΎΠ·Π΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ Π½ΠΎΠ²ΠΎΡΠΎΠ·Π΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠΉ HEAD"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (ΠΊΠΎΡΠ½Π΅Π²ΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠ²ΠΎΠ΄ΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠ°Π±Π»ΠΎΠ½ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "ΠΠΏΡΠΈΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· ΡΠ°ΠΉΠ»Π°"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "Π°Π²ΡΠΎΡ"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "ΠΏΠΎΠ΄ΠΌΠ΅Π½ΠΈΡΡ Π°Π²ΡΠΎΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "Π΄Π°ΡΠ°"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "ΠΏΠΎΠ΄ΠΌΠ΅Π½ΠΈΡΡ Π΄Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈ ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ Π΄Π»Ρ ΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ΅ΠΏΠ΅ΡΡ Π·Π° ΠΌΠΎΠΈΠΌ Π°Π²ΡΠΎΡΡΡΠ²ΠΎΠΌ (Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ -C/-c/--amend)"
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Signed-off-by:"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΡΠ°Π±Π»ΠΎΠ½Π°"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "ΠΏΠΎ-ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "ΠΊΠ°ΠΊ ΡΠ΄Π°Π»ΡΡΡ ΠΏΡΠΎΠ±Π΅Π»Ρ ΠΈ #ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠ°ΡΠΈΠΈ ΠΈΠ· ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΡΡΠ°ΡΡΡ ΡΠ°ΠΉΠ»ΠΎΠ² Π² ΡΠ°Π±Π»ΠΎΠ½ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "ΠΠΏΡΠΈΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ Π²ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ pre-commit ΠΈ commit-msg"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ, ΡΡΠΎ Π±ΡΠ΄Π΅Ρ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½ΠΎ"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ post-rewrite"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΏΡΡΡΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Ρ ΠΏΡΡΡΡΠΌ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΠΌ"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Π€Π°ΠΉΠ» MERGE_HEAD ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°: %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "ΠΡΠΌΠ΅Π½Π° ΠΊΠΎΠΌΠΌΠΈΡΠ°; Π²Ρ Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΠΈΠ»ΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅.\n"
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "ΠΡΠΌΠ΅Π½Π° ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ·-Π·Π° ΠΏΡΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6054,11 +6586,18 @@
msgid "cannot create configuration file %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ %s"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ ΠΎΠ΄Π½ΠΈΠΌ\n ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ, ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ --add ΠΈΠ»ΠΈ --replace-all, ΡΡΠΎΠ±Ρ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ %s."
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠ°Π·ΠΌΠ΅ΡΠΎΠ² Π² ΡΠ΄ΠΎΠ±ΠΎΡΠΈΡΠ°Π΅ΠΌΠΎΠΌ Π΄Π»Ρ ΡΠ΅Π»ΠΎΠ²Π΅ΠΊΠ° Π²ΠΈΠ΄Π΅"
@@ -6172,7 +6711,7 @@
msgid "only consider tags matching <pattern>"
msgstr "ΡΠ°ΡΡΠΌΠ°ΡΡΠΈΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΌΠ΅ΡΠΊΠΈ ΠΏΠΎ <ΡΠ°Π±Π»ΠΎΠ½Ρ>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ, ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΊΡΠ°ΡΠ΅Π½Π½ΡΠΉ Π½ΠΎΠΌΠ΅Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
@@ -6206,21 +6745,21 @@
msgid "invalid option: %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ: %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½ git ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΠΈΠΉ"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ «%s»."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ Π±ΠΎΠ»ΡΡΠ΅ Π΄Π²ΡΡ
Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²: «%s»"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ «%s»."
@@ -6293,247 +6832,259 @@
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<ΠΎΠΏΡΠΈΠΈ>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ ΡΠΎ Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "Π΄ΠΎΠΏΠΈΡΠ°ΡΡ ΠΊ .git/FETCH_HEAD Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "ΠΏΡΡΡ ΠΊ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅ ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ ΠΏΠ°ΠΊΠ΅ΡΠ° Π½Π° ΠΌΠ°ΡΠΈΠ½Π΅ Ρ Π²Π½Π΅ΡΠ½ΠΈΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ Ρ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ Π²ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ ΠΈ ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "Π½Π΅ ΠΈΠ·Π²Π»Π΅ΠΊΠ°ΡΡ Π²ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΡΠΊΠ°ΡΠ°Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ Π²Π½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΡ
ΡΠΆΠ΅ Π½Π΅Ρ Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ"
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "ΠΏΠΎ ΡΡΠ΅Π±ΠΎΠ²Π°Π½ΠΈΡ"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΡΠΌ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ Π·Π°Π³ΡΡΠΆΠ΅Π½Π½ΡΠΉ ΠΏΠ°ΠΊΠ΅Ρ Π΄Π°Π½Π½ΡΡ
"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
-msgstr "Π³Π»ΡΠ±ΠΎΠΊΠ°Ρ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°"
+msgstr "ΡΠ»ΡΠ³ΡΠ±ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "ΡΠ³Π»ΡΠ±ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π° ΠΎΡΠ½ΠΎΠ²ΡΠ²Π°ΡΡΡ Π½Π° Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ"
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "ΠΏΡΠ΅ΠΎΠ±ΡΠ°Π·ΠΎΠ²Π°ΡΡ Π² ΠΏΠΎΠ»Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "ΠΏΡΠΈΡΠΎΠ΅Π΄ΠΈΠ½ΡΡΡ ΡΡΠΎ ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊ Π²ΡΠ²ΠΎΠ΄Ρ ΠΏΡΡΠ΅ΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "ΡΠ΅ΠΆΠΈΠΌ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π΄Π»Ρ ΡΠ΅ΠΊΡΡΡΠΈΠΈ"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΡΡΡΠ»ΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅-ΡΡΡΠ»ΠΎΠΊ"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "ΡΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΡΡΡΠ»ΠΎΠΊ ΠΏΡΠΈ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΈ"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΡΡΠ»ΠΊΡ HEAD Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "ΠΎΠΏΡΠΈΡ fetch.output ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ %s"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ %s Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[Π°ΠΊΡΡΠ°Π»ΡΠ½ΠΎ]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½ΠΎ]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΠ·Π²Π»Π΅ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΠΌΠ΅ΡΠΊΠΈ]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[Π½ΠΎΠ²Π°Ρ ΠΌΠ΅ΡΠΊΠ°]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[Π½ΠΎΠ²Π°Ρ Π²Π΅ΡΠΊΠ°]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[Π½ΠΎΠ²Π°Ρ ΡΡΡΠ»ΠΊΠ°]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "Π±Π΅Π· ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΈ Π²ΠΏΠ΅ΡΠ΅Π΄"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s Π½Π΅ ΠΎΡΠΏΡΠ°Π²ΠΈΠ» Π²ΡΠ΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ\n"
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½ΠΎ ΠΈΠ·-Π·Π° ΡΠΎΠ³ΠΎ, ΡΡΠΎ ΡΠ°ΡΡΠΈΡΠ½ΡΠ΅ ΠΊΠΎΡΠ½ΠΈ Π½Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΎ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ"
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "ΠΠ· %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ; ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π·Π°ΠΏΡΡΡΠΈΡΡ «git remote prune %s», ΡΡΠΎΠ±Ρ ΠΏΠΎΡΠΈΡΡΠΈΡΡ ΡΡΠ°ΡΡΠ΅, ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡΡΡΠΈΠ΅ Π²Π΅ΡΠΊΠΈ"
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s Π±ΡΠ΄Π΅Ρ Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ΡΡΠ°Π»Π° Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[ΡΠ΄Π°Π»Π΅Π½ΠΎ]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(Π½Π΅Ρ)"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "ΠΡΠΊΠ°Π· ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ Π² ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ %s Π½Π΅ Π³ΠΎΠ»ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ «%2$s» Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° «%1$s» Π΄Π»Ρ %3$s"
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "ΠΠ°ΡΠ°ΠΌΠ΅ΡΡ «%s» ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π΄Π»Ρ %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "ΠΠ΅ Π·Π½Π°Ρ ΠΊΠ°ΠΊ ΠΈΠ·Π²Π»Π΅ΡΡ Ρ %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ. Π£ΠΊΠ°ΠΆΠΈΡΠ΅ URL ΠΈΠ»ΠΈ ΠΈΠΌΡ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΎΠ³ΠΎ Π΄ΠΎΠ»ΠΆΠ½Ρ ΠΈΠ·Π²Π»Π΅ΠΊΠ°ΡΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "ΠΠ°ΠΌ Π½ΡΠΆΠ½ΠΎ ΡΠΊΠ°Π·Π°ΡΡ ΠΈΠΌΡ ΠΌΠ΅ΡΠΊΠΈ."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "ΠΡΡΠΈΡΠ°ΡΠ΅Π»ΡΠ½Π°Ρ Π³ΡΡΠ±ΠΈΠ½Π° Π΄Π»Ρ --deepen Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen ΠΈ --depth Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --depth ΠΈ --unshallow"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° Π½Π° ΠΏΠΎΠ»Π½ΠΎΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ"
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all Π½Π΅ ΠΏΡΠΈΠ½ΠΈΠΌΠ°Π΅Ρ ΠΈΠΌΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΉ ΡΡΡΠ»ΠΎΠΊ"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ ΠΈΠ»ΠΈ Π³ΡΡΠΏΠΏΡ: %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π³ΡΡΠΏΠΏΡ ΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΉ ΡΡΡΠ»ΠΎΠΊ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°"
@@ -6542,23 +7093,23 @@
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅>] [--log[=<n>] | --no-log] [--file <ΡΠ°ΠΉΠ»>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ Π² ΠΆΡΡΠ½Π°Π» <n> Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΊΠΎΠ³ΠΎ ΠΆΡΡΠ½Π°Π»Π°"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "ΡΠΎΠΊΡΠ°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ --log (ΡΡΡΠ°ΡΠ΅Π²ΡΠ΅Π΅)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "ΡΠ΅ΠΊΡΡ"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΡΠ΅ΠΊΡΡ> ΠΊΠ°ΠΊ Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ"
@@ -6674,7 +7225,7 @@
msgid "show verbose names for reachable objects"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΡΠ΅ ΠΈΠΌΠ΅Π½Π° Π΄Π»Ρ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
@@ -6759,224 +7310,219 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΡΠΎΠΊΠΎΠ² (%d) Π΄Π»Ρ %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ grep ΠΈΠ· ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΡΠΈΠΏΠ° %s"
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ «%c» ΠΎΠΆΠΈΠ΄Π°Π΅Ρ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ «%s»"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr "ΠΈΡΠΊΠ°ΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, Π° Π½Π΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "ΠΈΡΠΊΠ°ΡΡ Π² ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π½Π΅ ΡΠΏΡΠ°Π²Π»ΡΠ΅ΠΌΡΠΌ git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "ΠΈΡΠΊΠ°ΡΡ ΠΈ Π² ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
, ΠΈ Π² Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π² «.gitignore»"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "ΠΈΡΠΊΠ°ΡΡ Π² Π½Π΅ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΡ
ΡΡΡΠΎΠΊΠ°Ρ
"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "Π±Π΅Π· ΡΡΠ΅ΡΠ° ΡΠ΅Π³ΠΈΡΡΡΠ°"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "ΠΈΡΠΊΠ°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π° ΡΠΎΠ»ΡΠΊΠΎ Π½Π° Π³ΡΠ°Π½ΠΈΡΠ°Ρ
ΡΠ»ΠΎΠ²"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠ° Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΊΠ°ΠΊ ΡΠ΅ΠΊΡΡΠ°"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "Π½Π΅ ΠΈΡΠΊΠ°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π° Π² Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°ΡΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΈΠ»ΡΡΡΠΎΠ² textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "Π½Π° Π³Π»ΡΠ±ΠΈΠ½Π΅ ΠΌΠ°ΠΊΡΠΈΠΌΡ <Π³Π»ΡΠ±ΠΈΠ½Π°> ΡΡΠΎΠ²Π½Π΅ΠΉ"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ΅Π½Π½ΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ POSIX"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ POSIX (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "ΠΈΠ½ΡΠ΅ΡΠΏΡΠ΅ΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΊΠ°ΠΊ ΡΠΈΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Perl-ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π½ΠΎΠΌΠ΅ΡΠ° ΡΡΡΠΎΠΊ"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ², Π° Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π½Π΅ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΠΠΠ¬ ΠΏΠΎΡΠ»Π΅ ΡΠΏΠΈΡΠΊΠ° ΠΈΠΌΠ΅Π½ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ, Π° Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "ΠΏΠΎΠ΄ΡΠ²Π΅ΡΠΈΠ²Π°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΡΡΡΡ ΡΡΡΠΎΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ ΠΈΠ· ΡΠ°Π·Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°Π· Π½Π° Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ Π² ΠΎΠ΄Π½ΠΎΠΌ ΡΠ°ΠΉΠ»Π΅"
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΈ ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠ΅ΡΠ΅Π΄ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ΠΌ"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΠΊΠΎΠ»> ΡΠ°Π±ΠΎΡΠΈΡ
ΠΏΠΎΡΠΎΠΊΠΎΠ²"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ -C ΠΠΠΠΠ§ΠΠ‘Π’ΠΠ"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΡΠΎΠΊΡ Ρ ΠΈΠΌΠ΅Π½Π΅ΠΌ ΡΡΠ½ΠΊΡΠΈΠΈ ΠΏΠ΅ΡΠ΅Π΄ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ΠΌ"
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΠΊΡΡΠΆΠ°ΡΡΡΡ ΡΡΠ½ΠΊΡΠΈΡ"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· ΡΠ°ΠΉΠ»Π°"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "ΠΏΠΎΠΈΡΠΊ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΉ Ρ <ΡΠ°Π±Π»ΠΎΠ½ΠΎΠΌ>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½ΠΈΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ, ΡΠΊΠ°Π·Π°ΡΡ Π½Π° ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠ΄Π° Π²ΡΡ
ΠΎΠ΄Π°"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΠΈΠ· ΡΠ°ΠΉΠ»ΠΎΠ² Π² ΠΊΠΎΡΠΎΡΡΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ Π²ΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ"
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π»Ρ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ ΠΏΠΎΠΈΡΠΊΠ°"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "ΠΏΠ΅ΠΉΠ΄ΠΆΠ΅Ρ"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ-ΠΏΠ΅ΠΉΠ΄ΠΆΠ΅ΡΠ°"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π²ΡΠ·ΠΎΠ² grep(1) (ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π² ΡΡΠΎΠΉ ΡΠ±ΠΎΡΠΊΠ΅)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "Π½Π΅ Π·Π°Π΄Π°Π½ ΡΠ°Π±Π»ΠΎΠ½."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΡΠΎΠΊΠΎΠ² (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ΡΠ°Π±ΠΎΡΠ°Π΅Ρ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --no-index."
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ."
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ."
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --cached ΠΈ Π΄Π΅ΡΠ΅Π²ΠΎ."
@@ -6990,176 +7536,180 @@
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "ΡΠΈΠΏ"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ°"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "Π·Π°ΠΏΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π² Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» Π±Π΅Π· ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΡΠΈΠ»ΡΡΡΠΎΠ²"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "Ρ
ΡΡΠΈΡΠΎΠ²Π°ΡΡ Π»ΡΠ±ΠΎΠΉ ΠΌΡΡΠΎΡ ΠΈ ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π΄Π»Ρ ΠΎΡΠ»Π°Π΄ΠΊΠΈ Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠ°ΠΊ, Π±ΡΠ΄ΡΠΎ ΠΎΠ½ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ Π²ΡΠ΅Ρ
Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΊΠΎΠΌΠ°Π½Π΄"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "ΠΈΡΠΊΠ»ΡΡΠΈΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π°"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΠΏΠΎΠ»Π΅Π·Π½ΡΡ
ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "ΠΎΡΠΊΡΡΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ man"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "ΠΎΡΠΊΡΡΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π² Π²Π΅Π±-Π±ΡΠ°ΡΠ·Π΅ΡΠ΅"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "ΠΎΡΠΊΡΡΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ info"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ΠΊΠΎΠΌΠ°Π½Π΄Π°>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ ΡΠΎΡΠΌΠ°Ρ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° «%s»"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠΈ Π²Π΅ΡΡΠΈΠΈ emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Π²Π΅ΡΡΠΈΡ emacsclient «%d» ΡΠ»ΠΈΡΠΊΠΎΠΌ ΡΡΠ°ΡΠ°Ρ (< 22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ «%s»"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr "«%s»: ΠΏΡΡΡ Π΄Π»Ρ Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man.\nΠΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «man.<ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ°>.cmd»."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr "«%s»: ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man.\nΠΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «man.<ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ°>.path»."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° Π·Π°ΠΏΡΠΎΡ"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΡΠΌΠΎΡΡΠ° info Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° Π·Π°ΠΏΡΠΎΡ"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "ΠΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ Π°ΡΡΠΈΠ±ΡΡΠΎΠ² Π΄Π»Ρ ΠΏΡΡΠ΅ΠΉ ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "ΠΠΎΠ²ΡΠ΅Π΄Π½Π΅Π²Π½ΡΠΉ Git Ρ 20 ΠΊΠΎΠΌΠ°Π½Π΄Π°ΠΌΠΈ ΠΈΠ»ΠΈ ΠΎΠΊΠΎΠ»ΠΎ ΡΠΎΠ³ΠΎ"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "ΠΠ»ΠΎΡΡΠ°ΡΠΈΠΉ Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΡΠΏΠ΅ΡΠΈΠ°Π»ΡΠ½ΠΎ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "ΠΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΡΠ²ΠΎΠΉΡΡΠ² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΈ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ΠΎΠ² Π΄Π»Ρ Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Π£ΡΠ΅Π±Π½ΠΎΠ΅ Π²Π²Π΅Π΄Π΅Π½ΠΈΠ΅ Π² Git (Π΄Π»Ρ Π²Π΅ΡΡΠΈΠΈ 1.5.1 ΠΈΠ»ΠΈ Π½ΠΎΠ²Π΅Π΅)"
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "ΠΠ±Π·ΠΎΡ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΠΌΡΡ
ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΠ΅ΠΉ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΠΌΡΡ
Π΄Π΅ΠΉΡΡΠ²ΠΈΠΉ Ρ Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "ΠΡΠ½ΠΎΠ²Π½ΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° Git:\n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅: %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "«git %s» — ΡΡΠΎ ΡΠΎΠΊΡΠ°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ «%s»"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅: %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΡΠΈΠΏΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π½Π° %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π½Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π° %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ %s: ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΡΠΉ ΡΠΈΠΏ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ %s"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
@@ -7168,69 +7718,73 @@
msgstr[2] "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ %d Π±Π°ΠΉΡΠΎΠ²"
msgstr[3] "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ %d Π±Π°ΠΉΡΠΎΠ²"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠ½Π΅Ρ ΡΠ°ΠΉΠ»Π°"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΡΠ΅Π½ΠΈΡ Π²Π²ΠΎΠ΄Π°"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΎ Π±ΠΎΠ»ΡΡΠ΅ Π±Π°ΠΉΡ, ΡΠ΅ΠΌ Π±ΡΠ»ΠΎ Π΄ΠΎΡΡΡΠΏΠ½ΠΎ"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr "ΠΏΠ°ΠΊΠ΅Ρ ΡΠ»ΠΈΡΠΊΠΎΠΌ Π±ΠΎΠ»ΡΡΠΎΠΉ Π΄Π»Ρ ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ off_t"
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "ΡΠ°Π·ΠΌΠ΅Ρ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΡΠ΅Π²ΡΡΠ°Π΅Ρ ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΠΉ Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ «%s»"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° «%s»"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Π²Π΅ΡΡΠΈΡ ΠΏΠ°ΠΊΠ΅ΡΠ° %<PRIu32> Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΏΠΎ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΡ %<PRIuMAX>: %s"
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠΆΠ°ΡΠΈΡ Π²Π΅ΡΠ½ΡΠ»Π° %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr "ΠΏΠ΅ΡΠ΅ΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΡ Ρ Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π΄Π΅Π»ΡΡΡ"
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π±Π°Π·ΠΎΠ²ΠΎΠΉ Π΄Π΅Π»ΡΡΡ Π²ΡΡΠ»ΠΎ Π·Π° Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠ΅ ΠΏΡΠ΅Π΄Π΅Π»Ρ"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ pread Π΄Π»Ρ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -7239,88 +7793,88 @@
msgstr[2] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %<PRIuMAX> Π±Π°ΠΉΡΠΎΠ² ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ"
msgstr[3] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %<PRIuMAX> Π±Π°ΠΉΡΠΎΠ² ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ"
-#: builtin/index-pack.c:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "ΡΠ΅ΡΡΠ΅Π·Π½ΠΎΠ΅ Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΡΠΈ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠ΅"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "ΠΠΠΠΠΠΠ ΠΠΠΠΠΠΠΠ― SHA1 Π‘ %s !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "ΠΡΠΈΠ±ΠΊΠ° Π² ΠΎΠ±ΡΠ΅ΠΊΡΠ΅"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "ΠΠ΅ Π²ΡΠ΅ Π΄ΠΎΡΠ΅ΡΠ½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ %s Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ"
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠΈ Π΄Π΅Π»ΡΡΡ"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "ΠΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "ΠΏΠ°ΠΊΠ΅Ρ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ (Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ SHA1)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ fstat Π΄Π»Ρ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΌΡΡΠΎΡ Π² ΠΊΠΎΠ½ΡΠ΅"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Π±Π΅Π·ΡΠΌΠ½Π°Ρ ΠΏΡΡΠ°Π½ΠΈΡΠ° Π² parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "ΠΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΏΠΎΡΠΎΠΊ: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "Π±Π΅Π·ΡΠΌΠ½Π°Ρ ΠΏΡΡΠ°Π½ΠΈΡΠ°"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
@@ -7329,12 +7883,12 @@
msgstr[2] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ"
msgstr[3] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "ΠΠ΅ΠΎΠΆΠΈΠ΄Π°Π½Π½Π°Ρ ΠΊΠΎΠ½ΡΡΠΎΠ»ΡΠ½Π°Ρ ΡΡΠΌΠΌΠ° Π² ΠΊΠΎΠ½ΡΠ΅ %s (Π΄ΠΈΡΠΊ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½?)"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -7343,44 +7897,44 @@
msgstr[2] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΡ
Π΄Π΅Π»ΡΡ"
msgstr[3] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΡ
Π΄Π΅Π»ΡΡ"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΆΠ°ΡΡ ΠΏΡΠΈΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ %s ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π·Π°ΠΊΡΡΡΠΈΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ «%s»"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΡΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ «%s»"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "Π½Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΊΠΈ ΠΏΠΎΡΠΎΠΊΠΎΠ², ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s"
@@ -7424,126 +7978,126 @@
msgid "bad %s"
msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ %s"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π΅Π· --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ «%s»"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠ°Π±Π»ΠΎΠ½Π° «%s»"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ opendir Π΄Π»Ρ «%s»"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ readlink Π΄Π»Ρ «%s»"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ «%s» Π½Π° «%s»"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» «%s» Π² «%s»"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΡΠ°Π±Π»ΠΎΠ½Π° %s"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "ΡΠ°Π±Π»ΠΎΠ½Ρ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "Π½Π΅ ΠΊΠΎΠΏΠΈΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· «%s»: %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "Π½Π΅ ΡΠ΄Π°Π΅ΡΡΡ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠΈΠΏΠ° %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π΅ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΡΠ°ΠΉΠ» %s Π² %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "ΠΠ΅ΡΠ΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΠΎΠ±ΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "ΠΠ΅ΡΠ΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΠΏΡΡΡΠΎΠΉ ΠΎΠ±ΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΠΏΡΡΡΠΎΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
"[--shared[=<permissions>]] [<directory>]"
msgstr "git init [-q | --quiet] [--bare] [--template=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³-ΡΠ°Π±Π»ΠΎΠ½ΠΎΠ²>] [--shared[=<ΠΏΡΠ°Π²Π°-Π΄ΠΎΡΡΡΠΏΠ°>]] [<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "ΠΏΡΠ°Π²Π°-Π΄ΠΎΡΡΡΠΏΠ°"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ΡΠΊΠ°ΠΆΠΈΡΠ΅, Π΅ΡΠ»ΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ git Π±ΡΠ΄Π΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΠΌΠΈ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΠΌΠΈ"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ mkdir %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ chdir Π² %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "%s (ΠΈΠ»ΠΈ --work-tree=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>) Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ %s (ΠΈΠ»ΠΈ --git-dir=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π΄ΠΎΡΡΡΠΏ ΠΊ ΡΠ°Π±ΠΎΡΠ΅ΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ «%s»"
@@ -7652,345 +8206,350 @@
msgid "Cover letter needs email format"
msgstr "Π‘ΠΎΠΏΡΠΎΠ²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ Π΄ΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΠΎΠΉ ΠΏΠΎΡΡΡ"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΠΎΠ»Π΅ in-reply-to: %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<ΠΎΠΏΡΠΈΠΈ>] [<Π½Π°ΡΠΈΠ½Π°Ρ-Ρ> | <Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½-ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "ΠΠ²Π° Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ «%s» ΠΊΠ°ΠΊ ΡΡΡΠ»ΠΊΡ."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΡΠ½ΡΡ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ Π²Π΅ΡΠΊΡ. ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π°Π²ΡΠΎΠΌΠΈΡΠΈΡΠ΅ΡΠΊΠΈ, ΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ git branch --set-upstream-to Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΈ.\nΠΠ»ΠΈ ΠΆΠ΅ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ --base=<ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ-ΠΊΠΎΠΌΠΌΠΈΡΠ°> Π²ΡΡΡΠ½ΡΡ."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΡΠ½ΡΡ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΠΏΡΠ΅Π΄ΠΊΠΎΠΌ ΡΠΏΠΈΡΠΊΠ° ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ"
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ Π² ΡΠΏΠΈΡΠΊΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ"
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΏΠ°ΡΡΠ°"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ [PATCH n/m] Π΄Π°ΠΆΠ΅ ΠΊΠΎΠ³Π΄Π° ΠΎΠ΄ΠΈΠ½ ΠΏΠ°ΡΡ"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ [PATCH] Π΄Π°ΠΆΠ΅ ΠΊΠΎΠ³Π΄Π° Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΠΏΠ°ΡΡΠ΅ΠΉ"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΠ°ΡΡΠΈ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "Π³Π΅Π½Π΅ΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΏΡΠΎΠ²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΠΎΡΡΡΡ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΡ ΡΠΈΡΠ΅Π» Π΄Π»Ρ ΠΈΠΌΠ΅Π½ Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "ΡΡΡΡΠΈΠΊΡ"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΡΡΡΠΈΠΊΡ <ΡΡΡΡΠΈΠΊΡ> Π²ΠΌΠ΅ΡΡΠΎ «.patch»"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr "Π½Π°ΡΠ°ΡΡ Π½ΡΠΌΠ΅ΡΠ°ΡΠΈΡ ΠΏΠ°ΡΡΠ΅ΠΉ Ρ <n>, Π° Π½Π΅ Ρ 1"
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ΅ΡΠΈΡ ΠΊΠ°ΠΊ ΡΠ½Π½ΡΡ ΠΏΠΎΠΏΡΡΠΊΡ"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ [RFC PATCH] Π²ΠΌΠ΅ΡΡΠΎ [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ [<ΠΏΡΠ΅ΡΠΈΠΊΡ>] Π²ΠΌΠ΅ΡΡΠΎ [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅Π·ΡΠ»ΡΡΠΈΡΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π² <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "Π½Π΅ ΠΎΠ±ΡΠ΅Π·Π°ΡΡ/Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΡΠ°Π·Π»ΠΈΡΠΈΡ"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π½ΡΠ»Π΅Π²ΡΡ Ρ
ΡΡ-ΡΡΠΌΠΌΡ Π² Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅ From"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "Π½Π΅ Π²ΠΊΠ»ΡΡΠ°ΡΡ ΠΏΠ°ΡΡ, Π΅ΡΠ»ΠΈ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΆΠ΅ Π΅ΡΡΡ Π² Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ ΠΏΠ°ΡΡΠ°, Π° Π½Π΅ Π² ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠΌ (ΠΏΠ°ΡΡ + ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°)"
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "ΠΠ΅ΡΠ΅Π΄Π°ΡΠ° ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "ΠΏΠΎΡΡΠ°"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ To:"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ Cc:"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π°Π΄ΡΠ΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΈΡΠ΅Π»Ρ Π½Π° <ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ> (ΠΈΠ»ΠΈ Π½Π° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°, Π΅ΡΠ»ΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ)"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΠΏΠ΅ΡΠ²ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ ΠΎΡΠ²Π΅ΡΠΎΠΌ Π½Π° <ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ>"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "Π²Π»ΠΎΠΆΠ΅Π½ΠΈΠ΅"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "ΠΏΡΠΈΠ»ΠΎΠΆΠΈΡΡ ΠΏΠ°ΡΡ"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΏΠ°ΡΡ Π² ΡΠ΅ΠΊΡΡ ΠΏΠΈΡΡΠΌΠ°"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ Π² ΠΏΠΈΡΡΠΌΠ°Ρ
ΠΈΠ΅ΡΠ°ΡΡ
ΠΈΡΠ½ΠΎΡΡΡ, ΡΡΠΈΠ»ΠΈ: shallow (ΡΠ°ΡΡΠΈΡΠ½ΡΡ), deep (Π³Π»ΡΠ±ΠΎΠΊΡΡ)"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΡ"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΡΡΠ΅Π±ΠΎΠ²Π°Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²Π° ΠΊ ΡΠ΅ΡΠΈΠΈ ΠΏΠ°ΡΡΠ΅ΠΉ"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ ΠΈΠ· ΡΠ°ΠΉΠ»Π°"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΏΠ°ΡΡΠ΅ΠΉ"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄ ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «%s»"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ «%s»"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΡΠΎΠ·Π΄Π°Π½ΠΈΠΈ Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ-Π²Π΅ΡΠΊΠ°> [<Π³ΠΎΠ»ΠΎΠ²Π°> [<ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΈΠ΅>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> "
"manually.\n"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ, ΡΠΊΠ°ΠΆΠΈΡΠ΅ <Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ-Π²Π΅ΡΠΊΡ> Π²ΡΡΡΠ½ΡΡ.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ°ΠΉΠ»>…]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² Ρ ΠΌΠ΅ΡΠΊΠ°ΠΌΠΈ"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»Ρ Π² Π½ΠΈΠΆΠ½Π΅ΠΌ ΡΠ΅Π³ΠΈΡΡΡΠ΅ Π΄Π»Ρ «ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΠΎ Π±Π΅Π· ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ» ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΊΡΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ Π΄ΡΡΠ³ΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π½Π° Π²ΡΠ²ΠΎΠ΄Π΅"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°ΠΉΠ»ΠΎΠ²ΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΠ΅, ΠΊΠΎΡΠΎΡΡΠ΅ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ"
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° Ρ «Π΄ΡΡΠ³ΠΈΡ
» ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ½ΡΡ ΡΡΡΠΎΠΊ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "Π½Π΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΏΡΡΡΡΠ΅ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π½Π° Π²ΡΠ²ΠΎΠ΄Π΅"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² ΠΈ ΠΎΡΠΌΠ΅Π½Π΅"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ, ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΠΈΠ· <ΡΠ°ΠΉΠ»>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΡΠ΅ ΠΏΠΎΠΊΠ°ΡΠ°Π»ΠΎΠΆΠ½ΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΠΈΠ· <ΡΠ°ΠΉΠ»>"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠ΅ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ git"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΡΠΈ ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊΠΎΡΠ½Π΅Π²ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΡΠΎΠ΅ΠΊΡΠ°"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ ΠΏΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΠΌ"
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr "Π΅ΡΠ»ΠΈ ΠΊΠ°ΠΊΠΎΠΉ-Π»ΠΈΠ±ΠΎ <ΡΠ°ΠΉΠ»> Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, ΡΡΠΈΡΠ°ΡΡ ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "ΠΏΡΠΈΡΠ²ΠΎΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΡΡΠΈ ΡΠ΄Π°Π»Π΅Π½Ρ, Ρ.ΠΊ. <ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°> Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ"
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠ»Π°Π΄ΠΎΡΠ½ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ"
@@ -8104,31 +8663,31 @@
msgid "Available custom strategies are:"
msgstr "ΠΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΡΠΊΠΈΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ:"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ (ΠΌΠ°ΠΊΡΠΈΠΌΡΠΌ <n>) Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΊΠΎΠ³ΠΎ ΠΆΡΡΠ½Π°Π»Π° Π² ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ, Π²ΠΌΠ΅ΡΡΠΎ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π΅ΡΠ»ΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
@@ -8136,28 +8695,28 @@
msgid "allow fast-forward (default)"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΡ Π²ΠΏΠ΅ΡΠ΅Π΄ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΅ΡΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π°"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠΌΠ΅Π΅Ρ Π²Π΅ΡΠ½ΡΡ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ GPG"
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΠ°Ρ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "ΠΎΠΏΡΠΈΡ=Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "ΠΎΠΏΡΠΈΠΈ Π΄Π»Ρ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠΉ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ"
@@ -8169,7 +8728,7 @@
msgid "abort the current in-progress merge"
msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΠΏΡΠΎΠΈΡΡ
ΠΎΠ΄ΡΡΠ΅Π³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΡ
ΠΈΡΡΠΎΡΠΈΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
@@ -8376,55 +8935,55 @@
msgid "Already up-to-date."
msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΡΡΠΈΠ²ΠΈΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅…\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "ΠΠ΅ Π²ΡΡΠ»ΠΎ.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ. ΠΡΡΡΠΎ!"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π°, ΠΎΡΠΌΠ΅Π½Π°."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π΄Π΅ΡΠ΅Π²Π° ΠΊ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠΌΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ…\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ %s…\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "ΠΠΈ ΠΎΠ΄Π½Π° ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅.\n"
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ %s.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΡ %s Π΄Π»Ρ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΊΠΈ ΡΡΡΠ½ΠΎΠ³ΠΎ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ².\n"
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "ΠΠ²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ; ΠΊΠ°ΠΊ ΠΈ Π·Π°ΠΏΡΠ°ΡΠΈΠ²Π°Π»ΠΈ, ΠΎΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΎ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n"
@@ -8449,23 +9008,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ΡΡΡΠ»ΠΊΠ°> [<ΠΊΠΎΠΌΠΌΠΈΡ>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΡΠ΅Ρ
ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠΎΠ²"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΡΠ΅Π΄ΠΊΠΎΠ² Π΄Π»Ρ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΌΠ½ΠΎΠ³ΠΎΡ
ΠΎΠ΄ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΅Π΄Π°ΡΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΈΠ· Π΄ΡΡΠ³ Π΄ΡΡΠ³Π°"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠ΅ΡΠ²ΡΠΌ ΠΏΡΠ΅Π΄ΠΊΠΎΠΌ Π²ΡΠΎΡΠΎΠ³ΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "Π½Π°ΠΉΡΠΈ ΠΆΡΡΠ½Π°Π»Π΅ ΡΡΡΠ»ΠΎΠΊ <ΡΡΡΠ»ΠΊΠ°> Π³Π΄Π΅ ΠΈΠΌΠ΅Π½Π½ΠΎ <ΠΊΠΎΠΌΠΌΠΈΡ> ΡΠ°Π·Π²Π΅ΡΠ²ΠΈΠ»ΡΡ"
@@ -8507,6 +9066,39 @@
msgid "set labels for file1/orig-file/file2"
msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ°ΠΉΠ»1/ΠΎΡΠΈΠ³-ΡΠ°ΠΉΠ»/ΡΠ°ΠΉΠ»2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΠΏΡΠΈΡ %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ «%s»"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·Ρ. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s."
+msgstr[1] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s."
+msgstr[2] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s."
+msgstr[3] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·Ρ. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s."
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "Π½Π΅ ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°Ρ Π½ΠΈΡΠ΅Π³ΠΎ, ΠΊΡΠΎΠΌΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄Π²ΡΡ
ΡΠΊΠ°Π·Π°ΡΠ΅Π»Π΅ΠΉ Π½Π° Π²Π΅ΡΠΊΠΈ."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°ΡΠΏΠΎΠ·Π½Π°ΡΡ ΡΡΡΠ»ΠΊΡ «%s»"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ %s ΠΈ %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -8615,43 +9207,43 @@
msgid "renaming '%s' failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠΈ «%s»"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] <ΠΊΠΎΠΌΠΌΠΈΡ>…"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° (Π±Π΅Π· SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠ»ΠΊΠΈ, ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΠ΅ <ΡΠ°Π±Π»ΠΎΠ½Ρ> "
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ Π²ΡΠ΅Ρ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ², Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΡ
ΡΠΎ Π²ΡΠ΅Ρ
ΡΡΡΠ»ΠΎΠΊ"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π²ΡΠ²ΠΎΠ΄ «undefined», Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "ΡΠ°Π·ΡΠΌΠ΅Π½ΠΎΠ²ΡΠ²Π°ΡΡ Π²Π²Π΅Π΄Π΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (Π΄Π»Ρ Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ)"
@@ -8779,8 +9371,8 @@
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ «show» Π΄Π»Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° «%s»"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΎΠΏΡΠΈΡ -m ΠΈΠ»ΠΈ -F"
+msgid "please supply the note contents using either -m or -F option"
+msgstr "ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΎΠΏΡΠΈΡ -m ΠΈΠ»ΠΈ -F"
#: builtin/notes.c:203
msgid "unable to write note object"
@@ -8788,8 +9380,8 @@
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Π‘ΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΎΡΡΠ°Π»ΠΎΡΡ Π² %s"
+msgid "the note contents have been left in %s"
+msgstr "ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΎΡΡΠ°Π»ΠΎΡΡ Π² %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
@@ -8801,381 +9393,433 @@
msgid "could not open or read '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ «%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
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ «%s» ΠΊΠ°ΠΊ ΡΡΡΠ»ΠΊΡ."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ «%s»."
+msgid "failed to read object '%s'."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ «%s»."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΈΠ· Π½Π΅Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° «%s»."
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΈΠ· Π½Π΅Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° «%s»."
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ Π²Π²Π΅Π΄Π΅Π½Π½Π°Ρ ΡΡΡΠΎΠΊΠ°: «%s»."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· «%s» Π² «%s»"
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "ΠΎΡΠΊΠ°Π· Π² ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ %s Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s (Π·Π° ΠΏΡΠ΅Π΄Π΅Π»Π°ΠΌΠΈ 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
msgid "too many parameters"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠ²"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΠ° Π΄Π»Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s."
+msgid "no note found for object %s."
+msgstr "Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΠ° Π΄Π»Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "ΡΠ΅ΠΊΡΡΠΎΠ²ΠΎΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π² ΡΠ°ΠΉΠ»Π΅"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈ ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΠ΅ ΠΏΡΡΡΠΎΠΉ Π·Π°ΠΌΠ΅ΡΠΊΠΈ"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "Π·Π°ΠΌΠ΅Π½ΠΈΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ. ΠΠ°ΠΉΠ΄Π΅Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ°Ρ Π·Π°ΠΌΠ΅ΡΠΊΠ° Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ «-f» Π΄Π»Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ."
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "ΠΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "Π·Π°Π³ΡΡΠ·ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ Π΄Π»Ρ ΠΊΠΎΠΌΠ°Π½Π΄Ρ <ΠΊΠΎΠΌΠ°Π½Π΄Π°> (Π²ΠΊΠ»ΡΡΠ°Π΅Ρ Π² ΡΠ΅Π±Ρ --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ°Π»ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠ²"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
" existing notes"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ. ΠΠ°ΠΉΠ΄Π΅Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ°Ρ Π·Π°ΠΌΠ΅ΡΠΊΠ° Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ «-f» Π΄Π»Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ."
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "ΠΠ΅Ρ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΠ΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "Π½Π΅Ρ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΠ΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr "ΠΠΏΡΠΈΠΈ -m/-F/-c/-C Π΄Π»Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Ρ «edit» ΡΡΡΠ°ΡΠ΅Π»ΠΈ.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π²ΠΌΠ΅ΡΡΠΎ Π½ΠΈΡ
«git notes add -f -m/-F/-c/-C».\n"
-#: builtin/notes.c:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «git notes merge»"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ· NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ· NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "ΠΠ±ΡΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "ΠΠΏΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy "
"(manual/ours/theirs/union/cat_sort_uniq)"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "ΠΠΎΠΌΠΌΠΈΡ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "ΠΡΠΌΠ΅Π½Π° ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --commit, --abort ΠΈ -s/--strategy"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΡΡΡΠ»ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "Π²Ρ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΡΡΡΠ»ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
-msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π΄Π»Ρ -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
+msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π΄Π»Ρ -s/--strategy: %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
-msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π° %s"
-
-#: builtin/notes.c:861
-#, c-format
-msgid "Failed to store link to current notes ref (%s)"
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π°Π΄ΡΠ΅Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ ΡΡΡΠ»ΠΊΠΈ Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΡ (%s)"
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π° %s"
#: builtin/notes.c:863
#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π°Π΄ΡΠ΅Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ ΡΡΡΠ»ΠΊΠΈ Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΡ (%s)"
+
+#: builtin/notes.c:865
+#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
" 'git notes merge --commit', or abort the merge with 'git notes merge "
"--abort'.\n"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ ΡΠ»ΠΈΡΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ. ΠΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² %s ΠΈ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΡΡΠ΅ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git notes merge --commit», ΠΈΠ»ΠΈ ΠΏΡΠ΅ΡΠ²ΠΈΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git notes merge --abort».\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "Π£ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s Π½Π΅Ρ Π·Π°ΠΌΠ΅ΡΠΊΠΈ\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr "ΠΏΠΎΠΏΡΡΠΊΠ° ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅ΠΉ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΡΡΡ, ΡΠΎΠ»ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "ΡΡΡΠ»ΠΊΠ°-Π½Π°-Π·Π°ΠΌΠ΅ΡΠΊΡ"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· <ΡΡΡΠ»ΠΊΠ°-Π½Π°-Π·Π°ΠΌΠ΅ΡΠΊΡ>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s"
+msgid "unknown subcommand: %s"
+msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<ΠΎΠΏΡΠΈΠΈ>…] [< <ΡΠΏΠΈΡΠΎΠΊ-ΡΡΡΠ»ΠΎΠΊ> | < <ΡΠΏΠΈΡΠΎΠΊ-ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<ΠΎΠΏΡΠΈΠΈ>…] <ΠΈΠΌΡ-Π±Π°Π·Ρ> [< <ΡΠΏΠΈΡΠΎΠΊ-ΡΡΡΠ»ΠΎΠΊ> | < <ΡΠΏΠΈΡΠΎΠΊ-ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΠΆΠ°ΡΠΈΡ (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΊΠ°ΡΡΡ Π±ΡΠ»ΠΈ ΡΠ°Π·Π±ΠΈΡΡ Π½Π° ΡΠ°ΡΡΠΈ ΠΈΠ·-Π·Π° pack.packSizeLimit"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "ΠΠ°ΠΏΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π½Π΅ Π±ΡΠ»ΠΈ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Ρ"
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Π‘ΠΆΠ°ΡΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "ΠΏΠ»ΠΎΡ
Π°Ρ Π²Π΅ΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° «%s»"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π·Π°ΠΏΠΈΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr "ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° --all-progress ΠΏΡΠΈ Π²ΠΊΠ»ΡΡΠ΅Π½Π½ΠΎΠΌ ΠΏΡΠΎΠ³ΡΠ΅ΡΡΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "Π²Π΅ΡΡΠΈΡ[,ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π² ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ Π²Π΅ΡΡΠΈΠΈ ΡΠΎΡΠΌΠ°ΡΠ°"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΠΉ ΡΠ°Π·ΠΌΠ΅Ρ ΠΊΠ°ΠΆΠ΄ΠΎΠ³ΠΎ Π²ΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΡΠΆΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π²Π·ΡΡΡΠ΅ ΠΈΠ· Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΠΎΠ³ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΠΎΠΊΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr "Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΠΎΠΊΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΠΎ ΠΏΠ°ΠΌΡΡΠΈ"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½Π°Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½Π°Ρ Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ Π΄Π΅Π»ΡΡ Π² ΡΠ΅Π·ΡΠ»ΡΡΠΈΡΡΡΡΠ΅ΠΌ ΠΏΠ°ΠΊΠ΅ΡΠ΅"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ Π΄Π΅Π»ΡΡΡ"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΌΠ½ΠΎΠ³ΠΎΠΏΠΎΡΠΎΡΠ½ΠΎΡΡΡ ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ Π»ΡΡΡΠΈΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ Π΄Π΅Π»ΡΡ"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "Π½Π΅ ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΡΡΡΡΠ΅ Π²ΡΡ
ΠΎΠ΄Π½ΡΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ Π΅ΡΠ΅ Π½Π΅ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Ρ"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΏΠΎ Π»ΡΠ±ΠΎΠΉ ΠΈΠ· ΡΡΡΠ»ΠΎΠΊ"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°ΡΡΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΆΡΡΠ½Π°Π»Π° ΡΡΡΠ»ΠΎΠΊ"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°Π΅ΡΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΠ°ΠΊΠ΅Ρ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΠΌΠ΅ΡΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°ΡΡΡΡ Π½Π° ΡΠΏΠ°ΠΊΠΎΠ²ΡΠ²Π°Π΅ΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "ΡΠΎΡ
ΡΠ°Π½ΡΡΡ ΡΡΡΠ»ΠΊΠΈ Π½Π° Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "ΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "Π²ΡΠ΅ΠΌΡ"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½ΠΎΠ²Π΅Π΅, ΡΠ΅ΠΌ <Π²ΡΠ΅ΠΌΡ>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΡΠΎΠ½ΠΊΠΈΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ, ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡΠΈΠ΅ Π΄Π»Ρ ΡΠ°ΡΡΠΈΡΠ½ΡΡ
ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΉ"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ, ΡΡΠ΄ΠΎΠΌ Ρ ΠΊΠΎΡΠΎΡΡΠΌΠΈ Π»Π΅ΠΆΠΈΡ .keep ΡΠ°ΠΉΠ»"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "ΡΡΠΎΠ²Π΅Π½Ρ ΡΠΆΠ°ΡΠΈΡ ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "Π½Π΅ ΡΠΊΡΡΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ ΡΡΠ°ΡΠ΅Π½ΠΈΡΠΌΠΈ"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr "ΠΏΠΎ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡΠΈ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
, Π΄Π»Ρ ΡΡΠΊΠΎΡΠ΅Π½ΠΈΡ ΠΏΠΎΠ΄ΡΡΠ΅ΡΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/pack-objects.c:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr "Π·Π°ΠΏΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
Π²ΠΌΠ΅ΡΡΠ΅ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ ΠΏΠ°ΠΊΠ΅ΡΠ°"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "ΠΠΎΠ΄ΡΡΠ΅Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
@@ -9215,69 +9859,62 @@
msgid "cannot prune in a precious-objects repo"
msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π½Π΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π² precious-objects ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s: %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΡΡΡΠ»ΠΊΠΈ>…]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "ΠΠΏΡΠΈΠΈ, ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "Π·Π°Π±ΡΠ°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ΠΈΡ, Π° Π½Π΅ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΡ Π²ΠΏΠ΅ΡΠ΅Π΄"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ Π²ΡΠΏΠΎΠ»Π½ΡΡΡ stash/stash pop Π΄ΠΎ ΠΈ ΠΏΠΎΡΠ»Π΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "ΠΠΏΡΠΈΠΈ, ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΠΏΠΎΠ»ΡΡΠ΅Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ pull.ff: %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Π ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "ΠΠ΅Ρ ΠΏΡΠ΅ΡΠ΅Π½Π΄Π΅Π½ΡΠΎΠ² Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΡΡΠ΅Π΄ΠΈ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²Ρ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠΎ ΠΏΠΎΠ»ΡΡΠΈΠ»ΠΈ."
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "ΠΠ΅Ρ ΠΏΡΠ΅ΡΠ΅Π½Π΄Π΅Π½ΡΠΎΠ² Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ ΡΡΠ΅Π΄ΠΈ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²Ρ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠΎ ΠΏΠΎΠ»ΡΡΠΈΠ»ΠΈ."
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "ΠΠ±ΡΡΠ½ΠΎ ΡΡΠΎ ΠΎΠ·Π½Π°ΡΠ°Π΅Ρ, ΡΡΠΎ Π²Ρ ΠΏΠ΅ΡΠ΅Π΄Π°Π»ΠΈ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΡΡΡΠ»ΠΊΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Π° ΠΈ ΡΡΠΎΡ ΡΠ°Π±Π»ΠΎΠ½ Π½ΠΈ Ρ ΡΠ΅ΠΌ Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π» Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ."
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9285,61 +9922,69 @@
"for your current branch, you must specify a branch on the command line."
msgstr "ΠΡ ΠΏΠΎΠΏΡΠΎΡΠΈΠ»ΠΈ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ «%s», Π½ΠΎ Π½Π΅ ΡΠΊΠ°Π·Π°Π»ΠΈ Π²Π΅ΡΠΊΡ. Π’Π°ΠΊ ΠΊΠ°ΠΊ ΡΡΠΎ Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π΄Π»Ρ Π²Π°ΡΠ΅ΠΉ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ, Π²Ρ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ Π²Π΅ΡΠΊΡ Π² ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠ΅."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΠΎΠΊ."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π° ΠΊΠ°ΠΊΡΡ Π²Π΅ΡΠΊΡ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Ρ ΠΊΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΎΠΉ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "ΠΠ»Ρ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ, ΡΠΌΠΎΡΡΠΈΡΠ΅ git-pull(1)."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<Π²Π½Π΅ΡΠ½ΠΈΠΉ-ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Π²Π΅ΡΠΊΠ°>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Π£ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΠΈ."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠ΅, Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅:"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr "ΠΠ°ΡΠ° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ, ΡΡΠΎ Π½ΡΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎ ΡΡΡΠ»ΠΊΠΎΠΉ\n«%s» ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ, Π½ΠΎ ΡΠ°ΠΊΠ°Ρ ΡΡΡΠ»ΠΊΠ° Π½Π΅ Π±ΡΠ»Π° ΠΏΠΎΠ»ΡΡΠ΅Π½Π°."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ --verify-signatures ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ Π΅ΡΠ΅ Π½Π΅ Π½Π°ΡΠ°Π²ΡΠ΅ΠΉΡΡ Π²Π΅ΡΠΊΠΈ Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ, Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΠΌΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡ."
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9347,7 +9992,7 @@
"commit %s."
msgstr "ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΎΠ±Π½ΠΎΠ²ΠΈΠ»ΠΎ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π°ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ.\nΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²Π°ΡΠ΅Π³ΠΎ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°\nΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9358,11 +10003,11 @@
"to recover."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°ΡΡ Π²ΠΏΠ΅ΡΡΠ΄ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² Π²Π°ΡΠ΅ΠΌ ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ Π²Ρ ΡΠ±Π΅Π΄ΠΈΡΠ΅ΡΡ, ΡΡΠΎ Π²Ρ ΡΠΎΡ
ΡΠ°Π½ΠΈΠ»ΠΈ Π²ΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎΠ΅ ΠΈΠ· Π²ΡΠ²ΠΎΠ΄Π°\n$ git diff %s\n, Π·Π°ΠΏΡΡΡΠΈΡΠ΅\n$ git reset --hard\nΠ΄Π»Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ»ΠΈΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ Π² ΠΏΡΡΡΠΎΠΉ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π΅ΡΠΊΡ."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ Π½Π°Π΄ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΠΌΠΈ Π²Π΅ΡΠΊΠ°ΠΌΠΈ."
@@ -9679,15 +10324,44 @@
msgid "debug unpack-trees"
msgstr "ΠΎΡΠ»Π°Π΄ΠΊΠ° unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <ΠΊΠ°ΡΠ°Π»ΠΎΠ³-git>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+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"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set 'receive.denyCurrentBranch' configuration variable to\n"
+"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr "ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ, ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ Π² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ Ρ ΡΠ°Π±ΠΎΡΠ΅ΠΉ\nΠΊΠΎΠΏΠΈΠ΅ΠΉ (Π½Π΅ Π³ΠΎΠ»ΠΎΠΌ) Π·Π°ΠΏΡΠ΅ΡΠ΅Π½ΠΎ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΡΡΠΎ ΡΠ΄Π΅Π»Π°Π΅Ρ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΠΈΠ½Π΄Π΅ΠΊΡΠ°\nΠΈ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΡΠΎΡΠΈΠ²ΠΎΡΠ΅ΡΠΈΠ²ΡΠΌ, ΠΈ Π²Π°ΠΌ ΠΏΡΠΈΠΉΠ΄Π΅ΡΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ\n«git reset --hard», ΡΡΠΎΠ±Ρ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΡΠ½ΠΎΠ²Π°\nΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΎΠ²Π°Π»ΠΎ HEAD.\n\nΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ «receive.denyCurrentBranch»\nΠ² «ignore» ΠΈΠ»ΠΈ «warn» Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ, ΡΡΠΎΠ±Ρ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ\nΠΎΡΠΏΡΠ°Π²ΠΊΡ Π² Π΅Π³ΠΎ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ; Π½ΠΎ ΡΡΠΎ Π½Π΅ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΡΡΡ, Π΅ΡΠ»ΠΈ ΡΠΎΠ»ΡΠΊΠΎ\nΠ²Ρ Π½Π΅ Π½Π°ΠΌΠ΅ΡΠ΅Π½Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π΅Π³ΠΎ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΡΠΏΠΎΡΠΎΠ±ΠΎΠΌ ΠΏΠΎΠ΄ΠΎΠ±Π½ΡΠΌ\nΠ²ΡΡΠ΅ΠΎΠΏΠΈΡΠ°Π½Π½ΠΎΠΌΡ.\n\nΠ§ΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈ Π²ΡΠ΅ ΡΠ°Π²Π½ΠΎ ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅\nΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ, ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ «receive.denyCurrentBranch»\nΠ² «refuse»."
+
+#: builtin/receive-pack.c:813
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr "ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ, ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π·Π°ΠΏΡΠ΅ΡΠ΅Π½ΠΎ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΏΠΎΡΠ»Π΅Π΄ΡΡΡΠΈΠΉ\n«git clone» Π½Π΅ ΡΠΌΠΎΠΆΠ΅Ρ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π½ΠΈΠΊΠ°ΠΊΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ², ΡΡΠΎ ΠΏΡΠΈΠ²Π΅Π΄Π΅Ρ ΠΊ ΠΏΡΡΠ°Π½ΠΈΡΠ΅.\n\nΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ «receive.denyDeleteCurrent»\nΠ² «warn» ΠΈΠ»ΠΈ «ignore», Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ, ΡΡΠΎΠ±Ρ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ\nΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Ρ ΠΈΠ»ΠΈ Π±Π΅Π· ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π°ΡΡΠ΅Π³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ.\n\nΠ§ΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅, Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ\nΠ² «refuse»."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³."
@@ -10006,7 +10680,7 @@
msgid " Fetch URL: %s"
msgstr " URL Π΄Π»Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(Π½Π΅Ρ URL)"
@@ -10044,7 +10718,7 @@
msgstr[2] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s"
msgstr[3] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (ΡΡΠ°ΡΡΡ Π½Π΅ Π·Π°ΠΏΡΠ°ΡΠΈΠ²Π°Π»ΡΡ)"
@@ -10060,7 +10734,7 @@
msgid " Local refs will be mirrored by 'git push'"
msgstr " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π·Π΅ΡΠΊΠ°Π»ΠΈΡΡΠ΅ΠΌΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git push»"
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -10069,131 +10743,136 @@
msgstr[2] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ «git push»%s:"
msgstr[3] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ «git push»%s:"
-#: builtin/remote.c:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ refs/remotes/<ΠΈΠΌΡ>/HEAD Π² Π·Π°Π²ΠΈΡΠΈΠΌΠΎΡΡΠΈ ΠΎΡ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ΡΠ΄Π°Π»ΠΈΡΡ refs/remotes/<ΠΈΠΌΡ>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "ΠΠ΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π½Π΅ΡΠ½ΠΈΡ
HEAD Π²Π΅ΡΠΎΠΊ. Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠ²Π½ΠΎ ΠΎΠ΄Π½Ρ ΠΈΠ· Π½ΠΈΡ
:"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΡΡΠ»ΠΊΠ°: %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΡΡΡΠΎΠΈΡΡ %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s Π±ΡΠ΄Π΅Ρ Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ!"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s ΡΡΠ°Π»Π° Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ!"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "ΠΡΠΈΡΡΠΊΠ° %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½Π°] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [ΡΠ΄Π°Π»Π΅Π½Π°] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΏΠΎΡΠ»Π΅ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ «%s»"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π²Π΅ΡΠΊΡ"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "Π½Π΅ ΡΠΊΠ°Π·Π°Π½ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr "Π·Π°ΠΏΡΠΎΡΠΈΡΡ URL ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ, Π²ΠΌΠ΅ΡΡΠΎ URL ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "Π²Π΅ΡΠ½ΡΡΡ Π²ΡΠ΅ URL"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL Π½Π΅ Π½Π°ΡΡΡΠΎΠ΅Π½Ρ Π΄Π»Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ «%s»"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ URL ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "ΡΠ΄Π°Π»ΠΈΡΡ URL"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --delete"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ°Π±Π»ΠΎΠ½ ΡΡΠ°ΡΠΎΠ³ΠΎ URL: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ URL: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ URL Π½Π΅-ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅; Π΄ΠΎΠ»ΠΆΠ½ΠΎ ΡΡΠΎΡΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<ΠΎΠΏΡΠΈΠΈ>]"
@@ -10377,8 +11056,8 @@
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<ΠΊΠΎΠΌΠΌΠΈΡ>]"
#: builtin/reset.c:27
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°> [--] <ΠΏΡΡΠΈ>…"
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°>] [--] <ΠΏΡΡΠΈ>…"
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
@@ -10496,27 +11175,27 @@
msgid "Could not write new index file."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΎΠ±ΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<ΠΎΠΏΡΠΈΠΈ>] -- [<Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ>…]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π²Π°ΡΡ Π΄Π°Π»Π΅Π΅ «--» ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr "ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΡΠ°Π·Π±ΠΎΡ ΠΏΠΎΡΠ»Π΅ ΠΏΠ΅ΡΠ²ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠ° Π½Π΅ ΡΠ²Π»ΡΡΡΠ΅Π³ΠΎΡΡ ΠΎΠΏΡΠΈΠ΅ΠΉ"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ Π² Π΄Π»ΠΈΠ½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10602,7 +11281,7 @@
msgid "revert failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
@@ -10756,70 +11435,131 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<Π±Π°Π·Π°>]] [--list] [<ΡΡΡΠ»ΠΊΠ°>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΊΠΈ"
+msgstr[1] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΎΠΊ"
+msgstr[2] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΎΠΊ"
+msgstr[3] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΊΠΈ"
+
+#: builtin/show-branch.c:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "Π½Π΅Ρ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΡ
Π·Π°ΠΏΠΈΡΠ΅ΠΉ Ρ %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
Π²Π΅ΡΠΎΠΊ"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
Π²Π΅ΡΠΎΠΊ"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "ΠΎΠΊΡΠ°ΡΠΈΠ²Π°ΡΡ «*!+-» Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ Π²Π΅ΡΠΊΠΎΠΉ"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² ΠΏΠΎΡΠ»Π΅ ΠΎΠ±ΡΠ΅Π³ΠΎ ΠΏΡΠ΅Π΄ΠΊΠ°"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ Π² Π²ΡΠ²ΠΎΠ΄ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΈΡ
ΠΈΠΌΠ΅Π½Π°ΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΡΠ΅ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΡΠ»ΠΊΠΈ, Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΈΠ· Π»ΡΠ±ΡΡ
Π΄ΡΡΠ³ΠΈΡ
ΡΡΡΠ»ΠΎΠΊ"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΊΠΎΠΌΠΌΠΈΡΡ Π² ΡΠΎΠΏΠΎΠ»ΠΎΠ³ΠΈΡΠ΅ΡΠΊΠΎΠΌ ΠΏΠΎΡΡΠ΄ΠΊΠ΅"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠΌΠΌΠΈΡΡ, ΠΎΡΡΡΡΡΡΠ²ΡΡΡΠΈΠ΅ Π² ΠΏΠ΅ΡΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠ΅"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΠ΅ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠ· ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΡ
ΡΡΠ΅ΠΊ"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "ΡΠΎΠΏΠΎΠ»ΠΎΠ³ΠΈΡΠ΅ΡΠΊΠ°Ρ ΡΠΎΡΡΠΈΡΠΎΠ²ΠΊΠ°, Ρ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΏΠΎΡΡΠ΄ΠΊΠ° Π΄Π°Ρ, Π΅ΡΠ»ΠΈ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<Π±Π°Π·Π°>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΡ
Π·Π°ΠΏΠΈΡΠ΅ΠΉ Π² ΠΆΡΡΠ½Π°Π»Π΅ ΡΡΡΠ»ΠΎΠΊ, Π½Π°ΡΠΈΠ½Π°Ρ Ρ Π±Π°Π·Ρ"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-"
+"base"
+msgstr "--reflog Π½Π΅ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎ Ρ --all, --remotes, --independent ΠΈ --merge-base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "Π½Π΅ ΡΠΊΠ°Π·Π°Π½Ρ Π²Π΅ΡΠΊΠΈ ΠΈ HEAD Π½Π΅ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --reflog ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠΌΠ΅Π½ΠΈ ΠΎΠ΄Π½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ"
+
+#: builtin/show-branch.c:733
+#, 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] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΡ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Π° ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+msgstr[1] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+msgstr[2] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+msgstr[3] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ."
+
+#: builtin/show-branch.c:737
+#, c-format
+msgid "no such ref %s"
+msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ %s"
+
+#: builtin/show-branch.c:829
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ."
+msgstr[1] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ."
+msgstr[2] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ."
+msgstr[3] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ."
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "«%s» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΊΠΎΠΌΠΌΠΈΡ %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
@@ -10878,12 +11618,12 @@
msgid "prepend comment character and space to each line"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΡΡΠΎΠΊΠΎΠΉ ΡΠΈΠΌΠ²ΠΎΠ» ΠΊΠΎΠΌΠΌΠ΅ΡΠ°ΡΠΈΡ ΠΈ ΠΏΡΠΎΠ±Π΅Π»"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "ΠΠΆΠΈΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»Π½ΠΎΠ΅ ΠΈΠΌΡ ΡΡΡΠ»ΠΊΠΈ, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s"
@@ -10893,181 +11633,200 @@
msgid "cannot strip one component off url '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ΅Π·Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ url «%s»"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠΉ ΡΠΈΠΌΠ²ΠΎΠ» Π΄Π»Ρ ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΡΡ
ΠΏΡΡΠ΅ΠΉ"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ΠΏΡΡΡ>] [<ΠΏΡΡΡ>…]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «%s» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² .gitmodules"
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ Π°Π΄ΡΠ΅ΡΠ° Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s»"
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s» (%s) Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°Π½ ΠΏΠΎ ΠΏΡΡΠΈ «%s»\n"
-#: builtin/submodule--helper.c:378
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅: ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΆΠΈΠΌ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s»\n"
-#: builtin/submodule--helper.c:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s»"
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "ΠΠ΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<ΠΏΡΡΡ>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ΠΏΡΡΡ>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ Π² .gitmodules Π΄Π»Ρ ΠΏΡΡΠΈ «%s»"
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s» Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Ρ: %s"
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "ΠΠ½Π°ΡΠ΅Π½ΠΈΠ΅ «%s» Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° submodule.alternateErrorStrategy Π½Π΅ ΡΠ°ΠΏΠΎΠ·Π½Π°Π½ΠΎ"
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "ΠΠ½Π°ΡΠ΅Π½ΠΈΠ΅ «%s» Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° submodule.alternateLocation Π½Π΅ ΡΠ°ΠΏΠΎΠ·Π½Π°Π½ΠΎ"
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr "ΠΊΡΠ΄Π° Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ Π½ΠΎΠ²ΡΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "ΠΈΠΌΡ Π½ΠΎΠ²ΠΎΠ³ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "url ΠΎΡΠΊΡΠ΄Π° Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΠ» ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ Π½ΠΎΠ²ΡΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "Π³Π»ΡΠ±ΠΈΠ½Π° Π΄Π»Ρ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr "git submodule--helper clone [--prefix=<ΠΏΡΡΡ>] [--quiet] [--reference <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>] [--name <ΠΈΠΌΡ>] [--depth <Π³Π»ΡΠ±ΠΈΠ½Π°>] --url <url> --path <ΠΏΡΡΡ>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «%s»"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ «%s» Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «%s»"
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» «%s»"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ ΡΠ°ΠΉΠ» %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s»"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «%s» Π½Π΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Ρ
ΠΎΡΠ΅Π»ΠΈ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ «update --init»?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "ΠΡΠΎΠΏΡΡΠΊ Π½Π΅ ΡΠ»ΠΈΡΠΎΠ³ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "ΠΡΠΎΠΏΡΡΠΊ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «%s»"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ «%s». ΠΠ°ΠΏΠ»Π°Π½ΠΈΡΠΎΠ²Π°Π½Π° ΠΏΠΎΠ²ΡΠΎΡΠ½Π°Ρ ΠΏΠΎΠΏΡΡΠΊΠ°"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ «%s» ΡΠΎ Π²ΡΠΎΡΠΎΠΉ ΠΏΠΎΠΏΡΡΠΊΠΈ, ΠΎΡΠΌΠ΅Π½Π°"
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr "ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅, Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
Π³ΡΠ°Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ"
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ΠΈΠ»ΠΈ none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½, ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½Π½ΡΠΉ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΌ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎΠΌ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ"
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "ΠΏΠ°ΡΠ°Π»Π»Π΅Π»ΡΠ½ΡΠ΅ Π·Π°Π΄Π°ΡΠΈ"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "Π΄ΠΎΠ»ΠΆΠ΅Π½ Π»ΠΈ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄Π°ΡΠΈΠΈ ΠΎ ΡΠ°ΡΡΠΈΡΠ½ΠΎΡΡΠΈ"
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "Π²Ρ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<ΠΏΡΡΡ>] [<ΠΏΡΡΡ>…]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° update"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ (%s) Π½Π°ΡΡΡΠΎΠ΅Π½Π° Π½Π° Π½Π°ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ ΠΈΠ· ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΎΠ³ΠΎ ΠΏΡΠΎΠ΅ΠΊΡΠ°, Π½ΠΎ ΠΎΠ½ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ Π²Π΅ΡΠΊΠ΅"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π° submodule--helper Π΄ΠΎΠ»ΠΆΠ½Π° Π²ΡΠ·ΡΠ²Π°ΡΡΡΡ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Ρ"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ submodule--helper"
@@ -11289,7 +12048,7 @@
msgid "Updated tag '%s' (was %s)\n"
msgstr "ΠΠ΅ΡΠΊΠ° «%s» ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° (Π±ΡΠ»Π° %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Π Π°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
@@ -11351,131 +12110,143 @@
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<ΠΎΠΏΡΠΈΠΈ>] [--] [<ΡΠ°ΠΉΠ»>…]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΈΠ½Π΄Π΅ΠΊΡ ΡΡΠ΅Π±ΡΠ΅Ρ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅: ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "Π½Π΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠ°ΠΉΠ»Π°ΠΌ Π·Π°ΠΌΠ΅Π½ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ ΠΈ Π½Π°ΠΎΠ±ΠΎΡΠΎΡ"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "Π·Π°ΠΌΠ΅ΡΠ°ΡΡ ΡΠ°ΠΉΠ»Ρ ΠΎΡΡΡΡΡΡΠ²ΡΡΡΠΈΠ΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ Π·Π°ΠΏΠΈΡΠΈ"
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΡΡΠ°ΡΡΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "ΠΊΠ°ΠΊ --refresh, Π½ΠΎ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΡ assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ°>,<ΠΎΠ±ΡΠ΅ΠΊΡ>,<ΠΏΡΡΡ>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΠΊΠ°ΠΊ «Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅»"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "ΡΠ±ΡΠ°ΡΡ ΠΏΠΎΠΌΠ΅ΡΠΊΡ assumed-unchanged"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΠΊΠ°ΠΊ «ΡΠΎΠ»ΡΠΊΠΎ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅»"
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "ΡΠ±ΡΠ°ΡΡ ΠΏΠΎΠΌΠ΅ΡΠΊΡ skip-worktree"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr "ΡΠΎΠ»ΡΠΊΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡ; Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π² Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΠΏΡΡΠΈ, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΎΠ½ΠΈ ΡΡΡΠ΅ΡΡΠ²ΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --stdin: ΡΡΡΠΎΠΊΠΈ Π½Π° Π²Π²ΠΎΠ΄Π΅ ΠΎΡΠ΄Π΅Π»ΡΡΡΡΡ ΠΠ£ΠΠΠΠ«Π Π±Π°ΠΉΡΠΎΠΌ"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ΅ΠΌΡΡ
ΠΏΡΡΠ΅ΠΉ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "Π·Π°Π½ΠΎΠ²ΠΎ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ #2 ΠΈ #3 Π΄Π»Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π·Π°ΠΏΠΈΡΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΡΠ»ΠΈΡΠ°ΡΡΡΡ ΠΎΡ HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ, ΠΎΡΡΡΡΡΡΠ²ΡΡΡΠΈΠ΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΠΌΡΠ΅ Π΄Π΅ΠΉΡΡΠ²ΠΈΡ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(Π΄Π»Ρ ΠΌΠ°ΡΠΈΠ½Π½ΠΎΠΉ ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠΈ) Π·Π°Π±ΡΡΡ ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΠ΅ Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΈΠ»ΠΈ Π·Π°ΠΏΡΠ΅ΡΠΈΡΡ ΡΠ°Π·Π΄Π΅Π»ΡΠ½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ/ΠΎΡΠΊΠ»ΡΡΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠ°ΠΉΠ»ΠΎΠ²Π°Ρ ΡΠΈΡΡΠ΅ΠΌΠ° ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Π±Π΅Π· ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²ΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΡ"
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ core.untrackedCache ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ true; ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΠ΅ Π΅Π³ΠΎ, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠΊΠ»ΡΡΠ΅Π½"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want"
+" to enable the untracked cache"
+msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ core.untrackedCache ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ false; ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΠ΅ Π΅Π³ΠΎ, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
+
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Π²ΠΊΠ»ΡΡΠ΅Π½ Π΄Π»Ρ «%s»"
@@ -11672,26 +12443,35 @@
msgid "only useful for debugging"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΎΡΠ»Π°Π΄ΠΊΠ΅"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<ΠΎΠΏΡΠΈΠΈ>] <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "Π²ΡΡ
ΠΎΠ΄ ΠΏΠΎΡΠ»Π΅ ΠΎΠ±ΠΌΠ΅Π½Π° ΠΎΠ΄Π½ΠΈΠΌ Π·Π°ΠΏΡΠΎΡΠΎΠΌ/ΠΎΡΠ²Π΅ΡΠΎΠΌ"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "Π²ΡΡ
ΠΎΠ΄ΠΈΡΡ ΡΡΠ°Π·Ρ ΠΏΠΎΡΠ»Π΅ Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΡΠ²Π»Π΅Π½ΠΈΡ ΡΠΏΠΈΡΠΊΠ° ΡΡΡΠ»ΠΎΠΊ"
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "Π½Π΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>/.git/ Π΅ΡΠ»ΠΈ <ΠΊΠ°ΡΠ°Π»ΠΎΠ³> Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ Git"
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ΠΏΡΠ΅ΡΠ²Π°ΡΡ ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΏΠΎΡΠ»Π΅ <ΠΊΠΎΠ»> ΡΠ΅ΠΊΡΠ½Π΄ ΠΏΡΠΎΡΡΠΎΡ"
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr "ΠΡΠ°Π²Π° Π΄ΠΎΡΡΡΠΏΠ° ΠΊ Π²Π°ΡΠ΅ΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ ΡΠΎΠΊΠ΅ΡΠΎΠ² ΡΠ»ΠΈΡΠΊΠΎΠΌ ΡΠ²ΠΎΠ±ΠΎΠ΄Π½Ρ; Π΄ΡΡΠ³Π΅ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΠΈ ΠΌΠΎΠ³ΡΠΈ ΡΠΈΡΠ°ΡΡ Π²Π°ΡΠΈ Π·Π°ΠΊΡΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΏΠ°ΡΠΎΠ»ΠΈ Π΄ΠΎΡΡΡΠΏΠ°. ΠΠ±Π΄ΡΠΌΠ°ΠΉΡΠ΅ Π·Π°ΠΏΡΡΠΊ ΠΊΠΎΠΌΠ°Π½Π΄Ρ:\n\n\tchmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "Π²ΡΠ²ΠΎΠ΄ ΠΎΡΠ»Π°Π΄ΠΎΡΠ½ΡΡ
ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ Π½Π° stderr"
@@ -11703,7 +12483,11 @@
"to read about a specific subcommand or concept."
msgstr "«git help -Π°» ΠΈ «git help -g» Π²ΡΠ²ΠΎΠ΄ΠΈΡ ΡΠΏΠΈΡΠΎΠΊ Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ ΠΈ\nΠ½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° ΠΏΠΎ ΡΠ΅ΠΌΠ°ΠΌ. ΠΠ°ΠΏΡΡΡΠΈΡΠ΅ «git help <ΠΊΠΎΠΌΠ°Π½Π΄Π°>» ΠΈΠ»ΠΈ\n«git help <ΡΠ΅ΡΠΌΠΈΠ½>», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΡΠ΅ΡΡΡ ΠΎ ΠΊΠΎΠ½ΠΊΡΠ΅ΡΠ½ΡΡ
ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π΅ ΠΈΠ»ΠΈ ΡΠ΅ΠΌΠ΅."
-#: http.c:323
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "ΠΠ΅Π»Π΅Π³Π°ΡΠΈΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΠΎΠ»Π½ΠΎΠΌΠΎΡΠΈΠΉ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ Ρ cURL < 7.22.0"
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Public key pinning Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ Ρ cURL < 7.44.0"
@@ -11819,15 +12603,15 @@
msgid "no-op (backward compatibility)"
msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ (ΠΎΡΡΠ°Π²Π»Π΅Π½ΠΎ Π΄Π»Ρ ΠΎΠ±ΡΠ°ΡΠ½ΠΎΠΉ ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎΡΡΠΈ)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <n> ΡΠΈΡΡ Π΄Π»Ρ Π²ΡΠ²ΠΎΠ΄Π° SHA-1"
@@ -12028,7 +12812,7 @@
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "ΠΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΡΡ octopus Π½Π΅ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ."
#: git-merge-octopus.sh:73
@@ -12196,6 +12980,10 @@
msgid "Cannot save the current index state"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°"
@@ -12233,6 +13021,10 @@
" To provide a message, use git stash save -- '$option'"
msgstr "ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ «stash save»: $option\n ΠΠ»Ρ ΠΏΡΠ΅Π΄ΠΎΡΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ git stash save -- «$option»"
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ --patch ΠΈ --include-untracked ΠΈΠ»ΠΈ --all ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr "ΠΠ΅Ρ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΡ"
@@ -12254,96 +13046,100 @@
msgid "Cannot remove worktree changes"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΠΏΡΠΈΡ: $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "ΠΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ: $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "«$args» Π½Π΅ ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΎ ΡΠΏΡΡΡΠ°Π½Π½ΡΠΌΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "«$args» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΡΠ»ΠΊΠΎΠΉ Π½Π° ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "ΠΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅. ΠΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π±Π΅Π· --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΠΈΠ½Π΄Π΅ΠΊΡΠ°"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠΏΡΡΠ°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "ΠΠ½Π΄Π΅ΠΊΡ Π½Π΅ Π±ΡΠ» ΠΈΠ·Π²Π»Π΅ΡΡΠ½ ΠΈΠ· ΡΠΏΡΡΡΠ°Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "Π‘ΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎΡ
ΡΠ°Π½Π΅Π½Ρ, Π½Π° ΡΠ»ΡΡΠ°ΠΉ Π΅ΡΠ»ΠΈ ΠΎΠ½ΠΈ ΡΠ½ΠΎΠ²Π° Π²Π°ΠΌ ΠΏΠΎΠ½Π°Π΄ΠΎΠ±ΡΡΡΡ."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "ΠΡΠ±ΡΠΎΡΠ΅Π½ΠΎ ${REV} ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠ±ΡΠΎΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΈΠ· ΡΠΏΡΡΡΠ°Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Π§ΡΠΎΠ±Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΈΡ
, Π½Π°Π±Π΅ΡΠΈΡΠ΅ «git stash apply»)"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "ΠΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΏΡΡΡ ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π½Π°Ρ
ΠΎΠ΄ΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΠ½Π΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ: «$repo» Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ Π°Π±ΡΠΎΠ»ΡΡΠ½ΡΠΌ ΠΈΠ»ΠΈ Π½Π°ΡΠΈΠ½Π°ΡΡΡΡ Ρ ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12351,22 +13147,22 @@
"Use -f if you really want to add it."
msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ ΠΏΡΡΠΈ ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ· Π²Π°ΡΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ² .gitignore:\n$sm_path\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ -f, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΅Π³ΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "ΠΠΎΠ±Π°Π²Π»ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈΠ· «$sm_path» Π² ΠΈΠ½Π΄Π΅ΠΊΡ"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "«$sm_path» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ git"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ git Π΄Π»Ρ «$sm_name» Π½Π°ΠΉΠ΄Π΅Π½ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡΡ
:"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -12375,188 +13171,184 @@
"or you are unsure what this means choose another name with the '--name' option."
msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ·\n $realrepo\nΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ «--force». ΠΡΠ»ΠΈ ΠΆΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π½ΡΠΆΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ ΠΈΠ»ΠΈ Π΅ΡΠ»ΠΈ Π²Ρ Π½Π΅ ΡΠ²Π΅ΡΠ΅Π½Ρ, ΡΡΠΎ ΡΡΠΎ Π·Π½Π°ΡΠΈΡ, ΡΠΎ ΡΠΊΠ°ΠΆΠΈΡΠ΅ Π΄ΡΡΠ³ΠΎΠ΅ ΠΈΠΌΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° «--name»."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° git Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$sm_name»."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$sm_path»"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Π‘Π±ΠΎΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$sm_path»"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$sm_path»"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "ΠΠ°Ρ
ΠΎΠ΄ΠΈΠΌ Π² «$displaypath»"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "ΠΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅ΠΌΡΡ Π½Π° «$displaypath»; ΡΡΠ΅Π½Π°ΡΠΈΠΉ Π²Π΅ΡΠ½ΡΠ» Π½Π΅ Π½ΡΠ»Π΅Π²ΠΎΠΉ ΠΊΠΎΠ΄ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ ΠΈ --all Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «--all», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΄Π΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$displaypath» ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ .git\n(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «rm -rf», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ ΡΠΎ Π²ΡΠ΅ΠΉ ΠΈΡΡΠΎΡΠΈΠ΅ΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to"
" discard them"
msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$displaypath» ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «-f», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΡ
"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "ΠΡΠΈΡΠ΅Π½ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ «$displaypath»"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$displaypath»"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΏΡΡΡΠΎΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$displaypath»"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$name» ($url) Π±ΡΠ» ΡΠ½ΡΡ Ρ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$sm_path»"
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ ${remote_name}/${branch} Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$sm_path»"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ ΠΏΠΎ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$displaypath», Π½ΠΎ Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ $sha1. Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΏΡΡΠΌΠΎΠΌ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°."
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ «$sha1» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»: Π·Π°Π±ΡΠ°Π½ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ «$sha1»"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ «$sha1» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»: ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ Π½Π°Π΄ «$sha1»"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ «$sha1» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»: ΡΠ»ΠΈΡΠΎ Ρ «$sha1»"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "Π‘Π±ΠΎΠΉ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ «$command $sha1» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$displaypath»"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr "ΠΠΏΡΠΈΡ --cached Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --files"
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ $mod_dst"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡ $sha1_src"
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡ $sha1_dst"
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΡ $sha1_src ΠΈ $sha1_dst"
-#: git-submodule.sh:918
-msgid "blob"
-msgstr "Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ «$sm_path»"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Π‘ΠΈΠ½Ρ
ΡΠΎΠ½ΠΈΠ·Π°ΡΠΈΡ url Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ «$displaypath»"
@@ -12566,12 +13358,12 @@
msgid "See git-${cmd}(1) for details."
msgstr "ΠΠ»Ρ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ, ΡΠΌΠΎΡΡΠΈΡΠ΅ git-${cmd}(1)."
-#: git-rebase--interactive.sh:131
+#: git-rebase--interactive.sh:140
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ($new_count/$total)"
-#: git-rebase--interactive.sh:147
+#: git-rebase--interactive.sh:156
msgid ""
"\n"
"Commands:\n"
@@ -12586,19 +13378,19 @@
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr "\nΠΠΎΠΌΠ°Π½Π΄Ρ:\n p, pick = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ\n r, reword = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n e, edit = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡΡ Π΄Π»Ρ Π²Π½Π΅ΡΠ΅Π½ΠΈΡ ΠΏΡΠ°Π²ΠΎΠΊ\n s, squash = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½ΠΈΡΡ Π΅Π³ΠΎ Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ\n f, fixup = ΠΊΠ°ΠΊ «squash», Π½ΠΎ ΠΎΡΠ±ΡΠΎΡΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΡΡΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n x, exec = Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ (ΠΎΡΡΠ°ΡΠΎΠΊ ΡΡΡΠΎΠΊΠΈ) Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΠΎΠ±ΠΎΠ»ΠΎΡΠΊΠΈ\n d, drop = ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ\n\nΠΡΠΈ ΡΡΡΠΎΠΊΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½Ρ; Π²ΡΠΏΠΎΠ»Π½ΡΡΡΡΡ ΠΏΠΎ ΠΎΡΠ΅ΡΠ΅Π΄ΠΈ ΡΠ²Π΅ΡΡ
Ρ Π²Π½ΠΈΠ·.\n"
-#: git-rebase--interactive.sh:162
+#: git-rebase--interactive.sh:171
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr "\nΠΠ΅ ΡΠ΄Π°Π»ΡΠΉΡΠ΅ ΡΡΡΠΎΠΊΠΈ. ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «drop», ΡΡΠΎΠ±Ρ ΡΠ²Π½ΠΎ ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ.\n"
-#: git-rebase--interactive.sh:166
+#: git-rebase--interactive.sh:175
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr "\nΠΡΠ»ΠΈ Π²Ρ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΡΡΠΎΠΊΡ Π·Π΄Π΅ΡΡ, ΡΠΎ Π£ΠΠΠΠΠΠΠ«Π ΠΠΠΠΠΠ’ ΠΠ£ΠΠΠ’ Π£Π’ΠΠ Π―Π.\n"
-#: git-rebase--interactive.sh:202
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -12610,61 +13402,61 @@
"\tgit rebase --continue"
msgstr "Π’Π΅ΠΏΠ΅ΡΡ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nΠΠ°ΠΊ ΡΠΎΠ»ΡΠΊΠΎ Π²Ρ Π±ΡΠ΄Π΅ΡΠ΅ Π΄ΠΎΠ²ΠΎΠ»ΡΠ½Ρ ΡΠ΅Π·ΡΠ»ΡΡΠ°ΡΠΎΠΌ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅\n\n\tgit rebase --continue"
-#: git-rebase--interactive.sh:227
+#: git-rebase--interactive.sh:236
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΠΊΠΎΡΠΎΡΡΠΉ ΠΌΠΎΠΆΠ½ΠΎ Π²Π·ΡΡΡ"
-#: git-rebase--interactive.sh:266
+#: git-rebase--interactive.sh:275
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°: $sha1"
-#: git-rebase--interactive.sh:308
+#: git-rebase--interactive.sh:317
msgid "Cannot write current commit's replacement sha1"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π·Π°ΠΌΠ΅Π½Ρ sha1 ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: git-rebase--interactive.sh:360
+#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π΄ΠΎ $sha1"
-#: git-rebase--interactive.sh:362
+#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°ΡΡ Π²ΠΏΠ΅ΡΠ΅Π΄ Π΄ΠΎ $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:380
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ HEAD Π½Π° $first_parent"
-#: git-rebase--interactive.sh:376
+#: git-rebase--interactive.sh:385
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠΏΠ»ΠΎΡΠ½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅: $sha1"
-#: git-rebase--interactive.sh:390
+#: git-rebase--interactive.sh:399
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΠ²ΡΠΎΡΠ΅Π½ΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ $sha1"
-#: git-rebase--interactive.sh:398
+#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²Π·ΡΡΡ $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:416
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "ΠΡΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½ΠΎΠΌΠ΅Ρ #${n}:"
-#: git-rebase--interactive.sh:412
+#: git-rebase--interactive.sh:421
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½ΠΎΠΌΠ΅Ρ #${n} Π±ΡΠ΄Π΅Ρ ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ:"
-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:432
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
@@ -12673,26 +13465,26 @@
msgstr[2] "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ $count ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²"
msgstr[3] "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ $count ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²"
-#: git-rebase--interactive.sh:431
+#: git-rebase--interactive.sh:440
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ $fixup_msg"
-#: git-rebase--interactive.sh:434
+#: git-rebase--interactive.sh:443
msgid "This is a combination of 2 commits."
msgstr "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ 2 ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²"
-#: git-rebase--interactive.sh:435
+#: git-rebase--interactive.sh:444
msgid "This is the 1st commit message:"
msgstr "ΠΡΠΎ 1-Π΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°:"
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
+#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
+#: git-rebase--interactive.sh:530
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ $sha1… $rest"
-#: git-rebase--interactive.sh:549
+#: git-rebase--interactive.sh:558
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -12701,31 +13493,31 @@
"you are able to reword the commit."
msgstr "ΠΠ΅ ΡΠ΄ΠΎΠ»ΠΎΡΡ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄Π° Π½Π° $sha1… $rest\nΠΡΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»ΠΎ, ΡΠΊΠΎΡΠ΅Π΅ Π²ΡΠ΅Π³ΠΎ, ΠΈΠ·-Π·Π° ΠΏΡΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ»ΠΈ ΠΈΠ·-Π·Π° ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ. ΠΡΠ»ΠΈ ΠΆΠ΅ ΡΡΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»ΠΎ ΠΈΠ·-Π·Π° ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΡΠΎ Π²Π°ΠΌ Π½ΡΠΆΠ½ΠΎ ΡΠ΅ΡΠΈΡΡ Ρ Π½ΠΈΠΌ ΠΏΡΠΎΠ±Π»Π΅ΠΌΡ ΠΈ ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ ΠΏΠΎΠΏΡΡΠΊΡ ΡΠ½ΠΎΠ²Π°."
-#: git-rebase--interactive.sh:564
+#: git-rebase--interactive.sh:573
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "ΠΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΎ Π½Π° $sha1_abbrev… $rest"
-#: git-rebase--interactive.sh:579
+#: git-rebase--interactive.sh:588
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π΅Π»Π°ΡΡ «$squash_style» Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: git-rebase--interactive.sh:621
+#: git-rebase--interactive.sh:630
#, sh-format
msgid "Executing: $rest"
msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅: $rest"
-#: git-rebase--interactive.sh:629
+#: git-rebase--interactive.sh:638
#, sh-format
msgid "Execution failed: $rest"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ: $rest"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:640
msgid "and made changes to the index and/or the working tree"
msgstr "ΠΈ Π±ΡΠ»ΠΈ ΡΠ΄Π΅Π»Π°Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈ/ΠΈΠ»ΠΈ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅"
-#: git-rebase--interactive.sh:633
+#: git-rebase--interactive.sh:642
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -12733,7 +13525,7 @@
msgstr "ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΎΡΠΈΠ±ΠΊΡ, Π° Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΡ\n\n\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
+#: git-rebase--interactive.sh:655
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -12743,49 +13535,49 @@
"\tgit rebase --continue"
msgstr "Π£ΡΠΏΠ΅ΡΠ½ΠΎΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅: $rest\nΠ½ΠΎ ΠΎΡΡΠ°Π»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈ/ΠΈΠ»ΠΈ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅\nΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, Π° Π·Π°ΡΠ΅ΠΌ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅\n\n\tgit rebase --continue"
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:666
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "ΠΠ΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°: $command $sha1 $rest"
-#: git-rebase--interactive.sh:658
+#: git-rebase--interactive.sh:667
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ° ΠΈΡΠΏΡΠ°Π²ΡΡΠ΅ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git rebase --edit-todo»."
-#: git-rebase--interactive.sh:693
+#: git-rebase--interactive.sh:702
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Π£ΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ ΠΈ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ½ $head_name."
-#: git-rebase--interactive.sh:740
+#: git-rebase--interactive.sh:749
msgid "Could not skip unnecessary pick commands"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ Π½Π΅Π½ΡΠΆΠ½ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ ΠΎΡΠ±ΠΎΡΠ° (pick)"
-#: git-rebase--interactive.sh:898
+#: git-rebase--interactive.sh:907
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
" - $line"
msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅: Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ SHA-1 ΠΈΠ»ΠΈ ΠΎΠ½ Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ. ΠΠ° ΡΡΡΠΎΠΊΠ΅:\n - $line"
-#: git-rebase--interactive.sh:931
+#: git-rebase--interactive.sh:940
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
" - $line"
msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅: ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π° Π½Π° ΡΡΡΠΎΠΊΠ΅:\n - $line"
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:979
msgid "could not detach HEAD"
msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠ΄Π΅Π»ΠΈΡΡ HEAD"
-#: git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:1017
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅: Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΌΠΎΠ³Π»ΠΈ Π±ΡΡΡ ΠΎΡΠ±ΡΠΎΡΠ΅Π½Ρ ΠΏΠΎ ΠΎΡΠΈΠ±ΠΊΠ΅.\nΠΡΠ±ΡΠΎΡΠ΅Π½Π½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ (ΠΎΡ Π½ΠΎΠ²ΡΡ
ΠΊ ΡΡΠ°ΡΡΠΌ):"
-#: git-rebase--interactive.sh:1016
+#: git-rebase--interactive.sh:1025
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
@@ -12793,26 +13585,28 @@
"The possible behaviours are: ignore, warn, error."
msgstr "ΠΠ»Ρ ΠΈΠ·Π±Π΅ΠΆΠ°Π½ΠΈΡ ΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ «drop» ΡΡΠΎΠ±Ρ ΡΠ²Π½ΠΎ ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ.\n\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ «git config rebase.missingCommitsCheck» Π΄Π»Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Π° ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠΉ.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ: ignore, warn, error."
-#: git-rebase--interactive.sh:1027
+#: git-rebase--interactive.sh:1036
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
"Ignoring."
msgstr "ΠΠ΅ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ Π½Π°ΡΡΡΠΎΠΉΠΊΠ° $check_level Π΄Π»Ρ ΠΎΠΏΡΠΈΠΈ rebase.missingCommitsCheck. ΠΠ³Π½ΠΎΡΠΈΡΡΡ."
-#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git rebase --edit-todo»."
+#: git-rebase--interactive.sh:1053
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase "
+"--continue'."
+msgstr "ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git rebase --edit-todo», Π° ΠΏΠΎΡΠΎΠΌ Π·Π°ΠΏΡΡΡΠΈΠ² «git rebase --continue»."
-#: git-rebase--interactive.sh:1045
+#: git-rebase--interactive.sh:1054
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "ΠΠ»ΠΈ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΏΡΠΎΡΠ΅ΡΡ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ «git rebase --abort»."
-#: git-rebase--interactive.sh:1069
+#: git-rebase--interactive.sh:1078
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1074
+#: git-rebase--interactive.sh:1083
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -12825,26 +13619,26 @@
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr "Π£ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΡΠ»ΠΈ ΡΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΎΠ±ΡΠ΅Π΄Π΅Π½Π΅Π½Ρ Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit --amend $gpg_sign_opt_quoted\n\nΠΡΠ»ΠΈ ΠΆΠ΅ ΠΎΠ½ΠΈ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΏΠΎΠΌΠ΅ΡΠ΅Π½Ρ Π² Π½ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit $gpg_sign_opt_quoted\n\nΠ Π»ΡΠ±ΠΎΠΌ ΡΠ»ΡΡΠ°Π΅, ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ ΠΊΠ°ΠΊ Π²Ρ Π·Π°ΠΊΠΎΠ½ΡΠΈΡΠ΅, ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΠ²:\n\n git rebase --continue\n"
-#: git-rebase--interactive.sh:1091
+#: git-rebase--interactive.sh:1100
msgid "Error trying to find the author identity to amend commit"
msgstr "ΠΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ Π°Π²ΡΠΎΡΠ° Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°"
-#: git-rebase--interactive.sh:1096
+#: git-rebase--interactive.sh:1105
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr "Π£ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅. Π‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ, Π° Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ «git rebase --continue» ΡΠ½ΠΎΠ²Π°."
-#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
msgid "Could not commit staged changes."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
-#: git-rebase--interactive.sh:1129
+#: git-rebase--interactive.sh:1138
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -12853,37 +13647,33 @@
"\n"
msgstr "\nΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΡΠ΅ΡΠ΅ ΡΠ°ΠΉΠ» ΡΠΎ ΡΠΏΠΈΡΠΊΠΎΠΌ Π΄Π΅Π» Π΄Π»Ρ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ.\nΠΠ»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ, ΠΏΠΎΡΠ»Π΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n git rebase --continue\n\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
msgid "Could not execute editor"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΎΡ"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Π‘Π½Π°ΡΠ°Π»Π° Π²Π°ΠΌ Π½ΡΠΆΠ½ΠΎ ΡΠΊΠ°Π·Π°ΡΡ Π²Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1159
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΡΠΈΡ $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1164
msgid "No HEAD?"
msgstr "ΠΠ΅Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ HEAD?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1165
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ $state_dir"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1167
msgid "Could not mark as interactive"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΠΊΠ°ΠΊ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
msgid "Could not init rewritten commits"
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1282
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -12892,14 +13682,14 @@
msgstr[2] "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ $shortrevisions Π½Π°Π΄ $shortonto ($todocount ΠΊΠΎΠΌΠ°Π½Π΄)"
msgstr[3] "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ $shortrevisions Π½Π°Π΄ $shortonto ($todocount ΠΊΠΎΠΌΠ°Π½Π΄)"
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1287
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr "\nΠΠΎ Π΅ΡΠ»ΠΈ Π²Ρ ΡΠ΄Π°Π»ΠΈΡΠ΅ Π²ΡΠ΅, ΡΠΎ ΠΏΡΠΎΡΠ΅ΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ Π±ΡΠ΄Π΅Ρ Π±ΡΠ΄Π΅Ρ ΠΏΡΠ΅ΡΠ²Π°Π½.\n\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1294
msgid "Note that empty commits are commented out"
msgstr "ΠΠ°ΠΌΠ΅ΡΡΡΠ΅, ΡΡΠΎ ΠΏΡΡΡΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠΈΡΠΎΠ²Π°Π½Π½Ρ"
@@ -12926,6 +13716,10 @@
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Π²Π΅ΡΠΎΠΊ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
@@ -12935,11 +13729,19 @@
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ $action: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Π ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ."
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr "ΠΠ°ΠΌ Π½ΡΠΆΠ½ΠΎ Π·Π°ΠΏΡΡΠΊΠ°ΡΡ ΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Π½Π°Ρ
ΠΎΠ΄ΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΠ½Π΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°."
