# repository | dipòsit
# skip | ometre
# squelch | silenciar
+# setting | paràmetre
# token | testimoni
#
# Alguns termes que són comandes específiques del git i d'àmbit molt tècnic
# cherry pick | «cherry pick»
# rebase | «rebase»
# stage | «stage»
+# stash | «sta»
# squash | «squash»
# unstage | «unstage»
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-18 20:41+0200\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-15 22:15+0200\n"
"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.0.4\n"
#: advice.c:58
#, c-format
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
" git checkout -b <new-branch-name>\n"
"\n"
msgstr ""
-"Avís: s'està agafant '%s'.\n"
+"Avís: s'està agafant «%s».\n"
"\n"
"Esteu en un estat de 'HEAD separat'. Podeu mirar al voltant, fer canvis\n"
"experimentals i cometre-los i podeu descartar qualsevol comissió que feu\n"
#: apply.c:58
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "opció d'espai en blanc '%s' no reconeguda"
+msgstr "opció d'espai en blanc «%s» no reconeguda"
#: apply.c:74
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opció d'ignora l'espai en blanc '%s' no reconeguda"
+msgstr "opció d'ignora l'espai en blanc «%s» no reconeguda"
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way no es poden usar junts."
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached i --3way no es poden usar junts."
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
-#: apply.c:836
+#: 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:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: apply.c:929
+#: apply.c:928
#, 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:967
+#: apply.c:966
#, 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:973
+#: apply.c:972
#, 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:974
+#: apply.c:973
#, 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:979
+#: apply.c:978
#, 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:1008
-#, fuzzy, c-format
+#: apply.c:1007
+#, c-format
msgid "invalid mode on line %d: %s"
-msgstr "línia d'identitat no vàlida: %s"
+msgstr "mode no vàlid en la línia %d: %s"
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
-msgstr ""
+msgstr "línies de capçalera %d i %d inconsistents"
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: apply.c:1567
+#: apply.c:1566
#, 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:1587
+#: apply.c:1586
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"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:1600
+#: apply.c:1599
#, 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:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr "pedaç malmès a la línia %d"
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: apply.c:1848
+#: apply.c:1865
#, 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:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: '%c'"
-#: apply.c:3052
+#: apply.c:3077
#, 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:3064
+#: apply.c:3089
#, 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:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
"tot cercant:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
-msgstr "manquen les dades de pedaç binari de '%s'"
+msgstr "manquen les dades de pedaç binari de «%s»"
-#: apply.c:3100
+#: apply.c:3125
#, 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'"
+msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
-#: apply.c:3146
+#: apply.c:3171
#, 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"
+"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
-#: apply.c:3156
+#: apply.c:3181
#, 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 "
+"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
-#: apply.c:3164
+#: apply.c:3189
#, 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"
+msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
-#: apply.c:3182
+#: apply.c:3207
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr "no es pot llegir la postimatge %s necessària per a '%s'"
+msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
-msgstr "el pedaç binari no s'aplica a '%s'"
+msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3201
+#: apply.c:3226
#, 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)"
+"el pedaç binari a «%s» crea un resultat incorrecte (esperant %s, %s rebut)"
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
-msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
+msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: apply.c:3556
+#: apply.c:3582
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:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "S'està retrocedint a una fusió de 3 vies...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
-msgstr "no es poden llegir els continguts actuals de '%s'"
+msgstr "no es poden llegir els continguts actuals de «%s»"
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
-msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n"
+msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
-#: apply.c:3610
+#: apply.c:3636
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
-msgstr "S'ha aplicat el pedaç a '%s' netament.\n"
+msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
-#: apply.c:3636
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
-msgstr "camí no vàlid: %s"
+msgstr "camí no vàlid: «%s»"
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3941
+#: apply.c:3967
#, 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:3946
+#: apply.c:3972
#, 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:3966
+#: apply.c:3992
#, 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"
+msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4076
+#: apply.c:4102
#, 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:4083
+#: apply.c:4109
#, 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:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camí '%s'"
+msgstr "make_cache_entry ha fallat per al camí «%s»"
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
+msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
-#: apply.c:4292
+#: apply.c:4318
#, 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:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, 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:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
-msgstr "no s'ha pogut escriure a '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
-msgstr "s'està tancant el fitxer '%s'"
+msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
-msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
+msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr "error intern"
-#: apply.c:4522
+#: apply.c:4548
#, 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 rebutjos..."
-#: apply.c:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
-msgstr "S'ha omès el pedaç '%s'."
+msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
-msgstr "no es pot obrir el pedaç '%s': %s"
+msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, 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:4874
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr "camí"
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr "número"
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:4933
+#: apply.c:4959
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:4937
+#: apply.c:4963
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:4939
+#: apply.c:4965
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:4941
+#: apply.c:4967
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:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:4951
+#: apply.c:4977
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:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr "acció"
-#: apply.c:4960
+#: apply.c:4986
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:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:4978
+#: apply.c:5004
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:4981
+#: apply.c:5007
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:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr "arrel"
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, 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:418
+#: archive.c:436
msgid "fmt"
msgstr "format"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr "prefix"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "fitxer"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "comprimeix més ràpidament"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr "dipòsit"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "ordre"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "L'opció --exec només es pot usar junt amb --remote"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
-msgstr "Format d'arxiu desconegut '%s'"
+msgstr "Format d'arxiu desconegut «%s»"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
-msgstr "Paràmetre no admès per al format '%s': -%d"
+msgstr "Paràmetre no admès per al format «%s»: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no és un nom d'atribut vàlid"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
#: bisect.c:447
#, c-format
msgid "Badly quoted content in file '%s': %s"
-msgstr "Comentari amb cometes errònies en el fitxer '%s': %s"
+msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
#: bisect.c:655
#, c-format
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"La base de fusió %s és %s.\n"
-"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
+"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
#: bisect.c:750
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
-msgstr "no s'ha pogut crear el fitxer '%s'"
+msgstr "no s'ha pogut crear el fitxer «%s»"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
-msgstr "no s'ha pogut llegir el fitxer '%s'"
+msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí dolents?\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1001
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
"--reverse i --first-parent-together requereixen una última comissió "
"especificada"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la branca remota %s de %s fent "
-"«rebase»."
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» "
+"fent «rebase»."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la branca local %s fent «rebase»."
+"La branca «%s» està configurada per a seguir la branca local «%s» fent "
+"«rebase»."
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "La branca %s està configurada per a seguir la branca local %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la referència remota %s fent "
+"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
"«rebase»."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "La branca %s està configurada per a seguir la referència remota %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència remota «%s»."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la referència local %s fent "
+"La branca «%s» està configurada per a seguir la referència local «%s» fent "
"«rebase»."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branca %s està configurada per a seguir la referència local %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
#: branch.c:185
#, c-format
msgid "'%s' is not a valid branch name."
-msgstr "'%s' no és un nom de branca vàlid."
+msgstr "«%s» no és un nom de branca vàlid."
#: branch.c:190
#, c-format
msgid "A branch named '%s' already exists."
-msgstr "Una branca amb nom '%s' ja existeix."
+msgstr "Una branca amb nom «%s» ja existeix."
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
+"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
"una branca."
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
-msgstr "la branca font demanada '%s' no existeix"
+msgstr "la branca font demanada «%s» no existeix"
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
-msgstr "No és un nom d'objecte vàlid: '%s'."
+msgstr "No és un nom d'objecte vàlid: «%s»."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objecte ambigu: '%s'."
+msgstr "Nom d'objecte ambigu: «%s»."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "No és un punt de ramificació vàlid: '%s'."
+msgstr "No és un punt de ramificació vàlid: «%s»."
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' ja s'ha agafat a '%s'"
+msgstr "«%s» ja s'ha agafat a «%s»"
#: branch.c:366
#, c-format
msgid "HEAD of working tree %s is not updated"
-msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
+msgstr "HEAD de l'arbre de treball %s no està actualitzat"
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' no sembla un fitxer de farcell v2"
+msgstr "«%s» no sembla un fitxer de farcell v2"
#: bundle.c:62
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
-msgstr "no s'ha pogut obrir '%s'"
+msgstr "no s'ha pogut obrir «%s»"
#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El farcell conté aquesta referència:"
msgstr[1] "El farcell conté aquestes %d referències:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El farcell requereix aquesta referència:"
msgstr[1] "El farcell requereix aquestes %d referències:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
-msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
+msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
-msgstr "no es pot crear '%s'"
+msgstr "no es pot crear «%s»"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:1511
+#: commit.c:1517
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:728
+#: config.c:729
#, c-format
msgid "bad config line %d in standard input"
msgstr "línia de configuració %d errònia en l'entrada estàndard"
-#: config.c:732
+#: config.c:733
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "línia de configuració %d errònia en el blob de submòdul %s"
-#: config.c:736
+#: config.c:737
#, c-format
msgid "bad config line %d in command line %s"
msgstr "línia de configuració %d errònia en la línia d'ordres %s"
-#: config.c:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr "fora de rang"
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor de configuració numèric erroni '%s' per '%s': %s"
+msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-#: config.c:879
+#: config.c:880
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "valor de configuració numèric erroni '%s' per '%s' en el blob %s: %s"
+msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
-#: config.c:882
+#: config.c:883
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valor de configuració numèric '%s' erroni per '%s' en el fitxer %s: %s"
+msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
-#: config.c:885
+#: config.c:886
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-"valor de configuració numèric '%s' erroni per '%s' en l'entrada estàndard: %s"
+"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
-#: config.c:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-"valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul "
+"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
"%s: %s"
-#: config.c:891
+#: config.c:892
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-"valor de configuració numèric '%s' erroni per '%s' en la línia d'ordres %s: "
+"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
"%s"
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
+msgstr "valor de configuració numèric dolent «%s» per «%s» en %s: %s"
-#: config.c:989
+#: config.c:990
#, c-format
msgid "failed to expand user dir in: '%s'"
-msgstr "s'ha produït un error en expandir el directori d'usuari en: '%s'"
+msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib dolent %d"
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d Erroni"
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
-msgstr "%s no vàlid: %s"
+msgstr "%s no vàlid: «%s»"
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2122
+#: config.c:2167
#, c-format
msgid "unable to parse '%s' from command-line config"
-msgstr "no s'ha pogut analitzar '%s' de la configuració de la línia d'ordres"
+msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
-#: config.c:2124
+#: config.c:2169
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "variable de configuració '%s' errònia en el fitxer '%s' a la línia %d"
+msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat fstat a %s"
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
-msgstr "no s'ha pogut establir '%s' a '%s'"
+msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
-msgstr "no s'ha pogut desestablir '%s'"
+msgstr "no s'ha pogut desestablir «%s»"
#: connect.c:50
msgid "The remote end hung up upon initial contact"
"Si us plau, assegureu-vos que tingueu els permisos\n"
"d'accés correctes i que el dipòsit existeixi."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
-msgstr "s'ha produït un error en llegir el fitxer d'ordres '%s'"
+msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
-msgstr "l'opció '%s' requereix un valor"
+msgstr "l'opció «%s» requereix un valor"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" S'ha produït un error en analitzar el percentatge limitant de dirstat "
-"'%s'\n"
+"«%s»\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Paràmetre de dirstat desconegut '%s'\n"
+msgstr " Paràmetre de dirstat desconegut «%s»\n"
+
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
-#: diff.c:282
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
+"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:3427
+#: diff.c:4189
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:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4459
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: '%s'"
+"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers."
-#: diff.c:4719
+#: diff.c:5508
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:4722
+#: diff.c:5511
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
"l'ordre."
-#: dir.c:1948
+#: dir.c:1983
msgid "failed to get kernel name and information"
msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
-#: dir.c:2067
+#: dir.c:2102
msgid "Untracked cache is disabled on this system or location."
msgstr ""
"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
msgstr "no s'ha pogut crear directoris per %s"
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "no s'ha pogut migrar el directori de '%s' a '%s'"
+msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "S'està filtrant el contingut"
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'"
+msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista superficial esperada"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
+msgstr "git fetch-pack: ACK/NAK esperat, «%s» rebut"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s rebut"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "s'està rendint"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr "fet"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr "El servidor accepta multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr "El servidor accepta no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr "El servidor accepta multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr "El servidor accepta side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr "El servidor accepta banda lateral"
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr "El servidor accepta allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "El servidor accepta allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr "El servidor accepta ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
-msgstr "s'ha produït un error en escriure la signatura separada a '%s'"
+msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
#: graph.c:97
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora el color invàlid '%.*s' en log.graphColors"
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
-msgstr "'%s': no s'ha pogut llegir %s"
+msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
-msgstr "s'ha produït un error en fer stat a '%s'"
+msgstr "s'ha produït un error en fer stat a «%s»"
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
-msgstr "'%s': lectura curta"
+msgstr "«%s»: lectura curta"
#: help.c:179
#, c-format
msgid "available git commands in '%s'"
-msgstr "ordres de git disponibles en '%s'"
+msgstr "ordres de git disponibles en «%s»"
#: help.c:186
msgid "git commands available from elsewhere on your $PATH"
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-"'%s' sembla una ordre de git, però no hem pogut\n"
+"«%s» sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
#: help.c:336
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
#: help.c:358
-#, fuzzy, c-format
+#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no "
-"existeix.\n"
-"S'està continuant sota l'assumpció que volíeu dir '%s'"
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
#: help.c:363
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
+msgstr "Es continua amb l'assumpció de que volíeu dir «%s»."
#: help.c:368
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
+msgstr "Es continua en %0.1f segons, assumint que volíeu dir «%s»."
#: help.c:376
#, 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'."
+msgstr "git: «%s» no és una ordre de git. Vegeu 'git --help'."
#: help.c:380
msgid ""
"\n"
"The most similar commands are"
msgstr[0] ""
+"\n"
+"L'ordre més similar és"
msgstr[1] ""
+"\n"
+"Les ordres més similar són"
#: help.c:395
msgid "git version [<options>]"
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-"no s'ha pogut detectar automàticament una adreça de correu vàlida ('%s' "
+"no s'ha pogut detectar automàticament una adreça de correu vàlida («%s» "
"rebut)"
#: ident.c:381
#: ident.c:387
#, c-format
msgid "unable to auto-detect name (got '%s')"
-msgstr "no s'ha pogut detectar automàticament el nom ('%s' rebut)"
+msgstr "no s'ha pogut detectar automàticament el nom («%s» rebut)"
#: ident.c:395
#, c-format
#: ident.c:401
#, c-format
msgid "name consists only of disallowed characters: %s"
-msgstr ""
+msgstr "el nom conté només caràcters no permesos: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"git ha tingut una pana:\n"
"elimineu el fitxer manualment per a continuar."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "No s'ha pogut crear '%s.lock': %s"
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache ha fallat per al camí '%s'"
+msgstr "addinfo_cache ha fallat per al camí «%s»"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "s'ha produït un error en crear el camí '%s'%s"
+msgstr "s'ha produït un error en crear el camí «%s»%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
+msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
-msgstr "no es pot llegir l'objecte %s '%s'"
+msgstr "no es pot llegir l'objecte %s «%s»"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
-msgstr "blob esperat per a %s '%s'"
+msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
-msgstr "s'ha produït un error en obrir '%s': %s"
+msgstr "s'ha produït un error en obrir «%s»: %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
-msgstr "s'ha produït un error en fer l'enllaç simbòlic '%s': %s"
+msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
-msgstr "no se sap què fer amb %06o %s '%s'"
+msgstr "no se sap què fer amb %06o %s «%s»"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre."
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
"%s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "S'està afegint %s fusionat"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
"%s"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr "Ja està al dia!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
msgstr "Fusionant:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat en comú:"
msgstr[1] "s'han trobat %u avantpassats en comú:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
-msgstr "No s'ha pogut analitzar l'objecte '%s'"
+msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\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
+#: notes-merge.c:279
#, 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:101
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor de notes.rewriteMode erroni: '%s'"
+msgstr "Valor de notes.rewriteMode erroni: «%s»"
#: notes-utils.c:111
#, c-format
#: notes-utils.c:141
#, c-format
msgid "Bad %s value: '%s'"
-msgstr "Valor erroni de %s: '%s'"
+msgstr "Valor erroni de %s: «%s»"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
+
+#: packfile.c:1683
+#, 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?)"
+
+#: packfile.c:1687
+#, 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?)"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
#: parse-options-cb.c:108
#, c-format
msgid "malformed object name '%s'"
-msgstr "nom d'objecte mal format '%s'"
+msgstr "nom d'objecte mal format «%s»"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
#: pathspec.c:258
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
+"els paràmetres d'especificació de camí 'glob' i 'noglob' globals són "
"incompatibles"
#: pathspec.c:265
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
-"els altres ajusts d'especificació de camí globals"
+"el paràmetre d'especificació de camí 'literal' global és incompatible amb "
+"tots els altres paràmetres d'especificació de camí globals"
#: pathspec.c:305
msgid "invalid parameter for pathspec magic 'prefix'"
#: pathspec.c:326
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
+msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»"
#: pathspec.c:331
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'"
+msgstr "')' mancant al final de la màgia d'especificació de camí en «%s»"
#: pathspec.c:369
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
+msgstr "Màgia d'especificació de camí no implementada '%c' en «%s»"
#: pathspec.c:428
#, c-format
#: pathspec.c:441
#, c-format
msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' és fora del dipòsit"
+msgstr "%s: «%s» és fora del dipòsit"
#: pathspec.c:515
#, c-format
msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (mnemònic: '%c')"
+msgstr "«%s» (mnemònic: '%c')"
#: pathspec.c:525
#, c-format
msgstr ""
"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
-#: pathspec.c:575
+#: pathspec.c:571
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
"versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb "
"tots els camins"
-#: pathspec.c:599
+#: pathspec.c:595
#, 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"
+msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
-msgstr "no s'ha pogut tancar '%s'"
+msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
-msgstr "no s'ha pogut fer stat a '%s'"
+msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
-msgstr "No s'ha pogut obrir '%s' per a escriptura"
+msgstr "No s'ha pogut obrir «%s» per a escriptura"
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no s'ha pogut eliminar la referència %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
msgid "could not delete references: %s"
msgstr "no s'ha pogut suprimir les referències: %s"
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no s'ha pogut eliminar la referència %s"
-
#: ref-filter.c:35 wt-status.c:1811
msgid "gone"
msgstr "no hi és"
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "paràmetre %%(%s) desconegut: %s"
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta paràmetres"
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:181
-#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) no accepta paràmetres"
+#: ref-filter.c:198
+#, fuzzy, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "paràmetre de reflexió desconegut: %s"
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "paràmetre %%(contents) no reconegut: %s"
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positiu esperat nom d'objecte:curt=%s"
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "paràmetre %%(align) no reconegut: %s"
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "paràmetre %%(if) no reconegut: %s"
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
-#: ref-filter.c:570
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
-#: ref-filter.c:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
-#: ref-filter.c:600
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
-#: ref-filter.c:602
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
-#: ref-filter.c:615
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
-#: ref-filter.c:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(cap branca, s'està fent «rebase» %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(cap branca, bisecció començada en %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat de %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(cap branca)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer ha fallat en %s per a %s"
-#: ref-filter.c:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
-msgstr "objecte mal format a '%s'"
+msgstr "objecte mal format a «%s»"
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: remote.c:747
+#: remote.c:750
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es poden obtenir ambdós %s i %s a %s"
-#: remote.c:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr "Error intern"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
-msgstr "no hi ha tal branca: '%s'"
+msgstr "no hi ha tal branca: «%s»"
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
-msgstr "cap font configurada per a la branca '%s'"
+msgstr "cap font configurada per a la branca «%s»"
-#: remote.c:1698
+#: remote.c:1699
#, 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:1713
+#: remote.c:1714
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-"el destí de pujada '%s' en el remot '%s' no té cap branca amb seguiment remot"
+"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
-msgstr "la branca '%s' no té cap remot al qual pujar"
+msgstr "la branca «%s» no té cap remot al qual pujar"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
-msgstr "les especificacions de referència de '%s' no inclouen '%s'"
+msgstr "les especificacions de referència de «%s» no inclouen «%s»"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no té destí (push.default és 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
#: remote.c:2076
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "La vostra branca està basada en '%s', però la font no hi és.\n"
+msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
#: remote.c:2080
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "La vostra branca està al dia amb '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "La vostra branca està al dia amb «%s».\n"
#: remote.c:2087
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n"
-msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"
+msgstr[0] "La vostra branca està davant de «%s» per %d comissió.\n"
+msgstr[1] "La vostra branca està davant de «%s» per %d comissions.\n"
#: remote.c:2093
msgid " (use \"git push\" to publish your local commits)\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] ""
-"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se "
+"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se "
"ràpidament.\n"
msgstr[1] ""
-"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
+"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se "
"ràpidament.\n"
#: remote.c:2104
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
-"La vostra branca i '%s' han divergit,\n"
+"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissió distinta cada una, respectivament.\n"
msgstr[1] ""
-"La vostra branca i '%s' han divergit,\n"
+"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
#: remote.c:2117
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:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
-msgstr "la vostra branca actual '%s' encara no té cap comissió"
+msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revertir"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Acció desconeguda: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
-msgstr "no s'ha pogut bloquejar '%s'"
+msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
-msgstr "no s'ha pogut escriure el terminador de línia a '%s'"
+msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
-msgstr "s'ha produït un error en finalitzar '%s'."
+msgstr "s'ha produït un error en finalitzar «%s»."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir '%s'"
+msgstr "no s'ha pogut llegir «%s»"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
-msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr "no s'ha pogut resoldre la comissió HEAD\n"
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr "no s'ha pogut actualitzar l'arbre cau\n"
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr "no s'ha pogut analitzar la comissió %s\n"
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "no s'ha pogut analitzar la comissió pare %s\n"
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
-msgstr "no es pot escriure '%s'"
+msgstr "no es pot escriure «%s»"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:973
+#: sequencer.c:975
#, 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:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"s'ha especificat la línia principal però la comissió %s no és una fusió."
-#: sequencer.c:991
+#: sequencer.c:993
#, c-format
msgid "cannot get commit message for %s"
msgstr "no es pot obtenir el missatge de comissió de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
-msgstr "no s'ha pogut canviar el nom '%s' a '%s'"
+msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:1179
+#: sequencer.c:1181
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha produït un error en llegir l'índex"
-#: sequencer.c:1186
+#: sequencer.c:1188
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha produït un error en actualitzar l'índex"
-#: sequencer.c:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
-msgstr "No es pot '%s' sense una comissió prèvia"
+msgstr "No es pot «%s» sense una comissió prèvia"
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir '%s'."
+msgstr "no s'ha pogut llegir «%s»."
-#: sequencer.c:1359
+#: sequencer.c:1361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'."
-#: sequencer.c:1361
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
-msgstr "full d'instruccions inusable: '%s'"
+msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
-msgstr "full d'opcions mal format: '%s'"
+msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
+msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
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:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
-msgstr "no es pot obrir '%s'"
+msgstr "no es pot obrir «%s»"
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
-msgstr "no es pot llegir '%s': %s"
+msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:1647
+#: sequencer.c:1666
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» '%s' és malmès"
+msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
-#: sequencer.c:1658
+#: sequencer.c:1677
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
-msgstr "no s'ha pogut copiar '%s' a '%s'"
+msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1885
msgid "and made changes to the index and/or the working tree\n"
msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
-#: sequencer.c:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
msgstr ""
-"L'execució ha tingut èxit: %s\n"
+"l'execució ha tingut èxit: %s\n"
"però ha deixat canvis a l'índex i/o l'arbre de treball\n"
-"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
+"Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1925
-#, fuzzy, c-format
+#: sequencer.c:1948
+#, c-format
msgid "Applied autostash.\n"
-msgstr "S'ha aplicat el magatzem automàtic."
+msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"L'aplicació del magatzem automàtic ha resultat en conflictes.\n"
-"Els vostres canvis estan segurs en el magatzem.\n"
+"L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
+"Els vostres canvis estan segurs en el «stash».\n"
"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
-#: sequencer.c:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr "No s'ha pogut llegir orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut analitzar %s"
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
-msgstr "fitxer no vàlid: '%s'"
+msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
-msgstr "contingut no vàlid: '%s'"
+msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:2218
+#: sequencer.c:2241
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n"
"primer cometeu-los i després executeu 'git rebase --continue' de nou."
-#: sequencer.c:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
msgstr "No s'ha pogut cometre els canvis «staged»."
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió dolenta"
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: opcions no gestionades"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: s'ha produït un error preparant les revisions"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "llista per a fer inestable: «%s»"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. "
+"S'està ignorant."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Advertència: pot ser que algunes comissions s'hagin descartat "
+"accidentalment.\n"
+"Les comissions descartades (més nova a més vella):\n"
+
+#: sequencer.c:2648
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
+"comissió.\n"
+"\n"
+"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
+"d'advertències.\n"
+"Els comportaments possibles són: ignore, warn, error.\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
+"continue'.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "no s'ha pogut analitzar la comissió «%s»"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "no s'ha pogut truncar a «%s»"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "l'script ja estava endreçat."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no s'ha pogut finalitzar «%s»"
+
#: setup.c:171
#, c-format
msgid ""
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n"
+"paràmetre ambigu «%s»: revisió no coneguda o camí no en l'arbre de treball.\n"
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"paràmetre ambigu '%s': ambdós una revisió i un nom de fitxer\n"
+"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
-msgstr "No es pot canviar a '%s'"
+msgstr "No es pot canviar a «%s»"
-#: setup.c:1081
+#: setup.c:1077
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"no està establert)."
-#: setup.c:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
"escriptura."
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
-msgstr "el camí '%s' no existeix"
+msgstr "el camí «%s» no existeix"
-#: sha1_file.c:586
+#: sha1_file.c:554
#, 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."
+"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
-#: sha1_file.c:592
+#: sha1_file.c:560
#, 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."
+msgstr "el dipòsit de referència «%s» no és un dipòsit local."
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència '%s' és superficial"
+msgstr "el dipòsit de referència «%s» és superficial"
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència '%s' és empeltat"
-
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
+msgstr "el dipòsit de referència «%s» és empeltat"
-#: sha1_file.c:2729
-#, 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:2733
-#, 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:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: sha1_name.c:589
+#: sha1_name.c:590
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"
"suprimiu-les. Desactiveu aquest missatge executant\n"
"\"git config advice.objectNameWarning false\""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
"de fusió"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
-#: submodule.c:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-#: submodule.c:115
+#: submodule.c:138
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
-#: submodule.c:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "no es permeten els valors negatius a submodule.fetchJobs"
-
-#: submodule.c:376
-#, fuzzy, c-format
+#: submodule.c:309
+#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "S'està ometent el submòdul '%s'"
+msgstr "al submòdul no populat «%s»"
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació '%s' és en el submòdul '%.*s'"
+msgstr "L'especificació «%s» és en el submòdul '%.*s'"
+
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
-#: submodule.c:1337
+#: submodule.c:1304
#, c-format
msgid "'%s' not recognized as a git repository"
-msgstr "'%s' no reconegut com un dipòsit git"
+msgstr "«%s» no reconegut com un dipòsit git"
-#: submodule.c:1475
+#: submodule.c:1442
#, c-format
msgid "could not start 'git status' in submodule '%s'"
-msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'"
+msgstr "no s'ha pogut iniciar 'git status' al submòdul «%s»"
-#: submodule.c:1488
+#: submodule.c:1455
#, c-format
msgid "could not run 'git status' in submodule '%s'"
-msgstr "no s'ha pogut executar 'git status' al submòdul '%s'"
+msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
-#: submodule.c:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
-msgstr "el submòdul '%s' té l'índex brut"
+msgstr "el submòdul «%s» té l'índex brut"
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de "
+"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
-msgstr "no s'ha trobat el nom pel submòdul '%s'"
+msgstr "no s'ha trobat el nom pel submòdul «%s»"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
-msgstr "no s'ha pogut crear el directori '%s'"
+msgstr "no s'ha pogut crear el directori «%s»"
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'\n"
msgstr ""
"S'està migrant el directori de '%s%s' des de\n"
-"'%s' a\n"
-"'%s'\n"
+"«%s» a\n"
+"«%s»\n"
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí de submòdul '%s'"
+msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no es permeten els valors negatius a submodule.fetchjobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
-msgstr "l'execució de l'ordre de remolc '%s' ha fallat"
+msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
-msgstr "valor desconegut '%s' per a la clau '%s'"
+msgstr "valor desconegut «%s» per a la clau «%s»"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "testimoni de remolc buit en el remolc '%.*s'"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
-msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
+msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "no s'ha pogut llegir des d'stdin"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "el fitxer %s no és un fitxer regular"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "el fitxer %s no és gravable per l'usuari"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "no s'ha pogut obrir el fitxer temporal"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
+msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
-msgstr "transport: opció de profunditat no vàlida '%s'"
+msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr "S'està avortant."
msgid "empty filename in tree entry"
msgstr "nom de fitxer buit en una entrada d'arbre"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"agafar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"canviar de branca."
+"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de canviar de "
+"branca."
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"agafar:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"fusionar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"fusionar."
+"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de fusionar."
-#: unpack-trees.c:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusionar:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
+"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de %s."
-#: unpack-trees.c:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"agafar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"agafar:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"fusionar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"fusionar:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"agafar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:145
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"agafar:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"fusionar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"fusionar:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular."
+msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular."
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
"dia:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"actualitzar l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
"No es pot actualitzar el submòdul:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "el submòdul'%s' té una estratègia d'actualització no admesa"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr "S'estan agafant fitxers"
#: worktree.c:245
#, c-format
msgid "failed to read '%s'"
-msgstr "s'ha produït un error en llegir '%s'"
+msgstr "s'ha produït un error en llegir «%s»"
#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
-msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
-
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no s'ha pogut obrir '%s' per a escriptura"
+msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
-msgstr "no s'ha pogut obrir '%s' per a lectura"
+msgstr "no s'ha pogut obrir «%s» per a lectura"
#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
-msgstr "no s'ha pogut accedir a '%s'"
+msgstr "no s'ha pogut accedir a «%s»"
#: wrapper.c:632
msgid "unable to get current working directory"
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
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:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
-#: wt-status.c:222
+#: wt-status.c:220
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:224
+#: wt-status.c:222
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:225
+#: wt-status.c:223
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:227
+#: wt-status.c:225
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:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "suprimit per ambdós:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "afegit per nosaltres:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "suprimit per ells:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "afegit per ells:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "afegit per ambdós:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "modificat per ambdós:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "fitxer nou:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "copiat:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "suprimit:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "modificat:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "canviat de nom:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "canviat de tipus:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "desconegut:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "sense fusionar:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "comissions noves, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "contingut modificat, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:821
-#, fuzzy, c-format
+#: wt-status.c:819
+#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Actualment esteu fent «rebase»."
-msgstr[1] "Actualment esteu fent «rebase»."
+msgstr[0] "L'«stash» té actualment %d entrada"
+msgstr[1] "L'«stash» té actualment %d entrades"
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"No toqueu la línia a dalt.\n"
-"Tot el que hi ha a sota s'eliminarà."
+"No modifiqueu o suprimiu la línia de dalt.\n"
+"Tot el que hi ha a sota s'ignorarà."
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
#: wt-status.c:1259
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu fent «rebase» de la branca '%s' en '%s'."
+msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
#: wt-status.c:1264
msgid "You are currently rebasing."
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
-"'%s' en '%s'."
+"«%s» en «%s»."
#: wt-status.c:1297
msgid "You are currently splitting a commit during a rebase."
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
-"'%s' en '%s'."
+"«%s» en «%s»."
#: wt-status.c:1309
msgid "You are currently editing a commit during a rebase."
#: wt-status.c:1364
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
+msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
#: wt-status.c:1368
msgid "You are currently bisecting."
msgstr "Comissió inicial"
#: wt-status.c:1607
-#, fuzzy
msgid "No commits yet"
-msgstr "no s'ha analitzat cap comissió."
+msgstr "No s'ha fet cap comissió encara."
#: wt-status.c:1621
msgid "Untracked files"
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git "
-"add\" per a seguir-los)\n"
+"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add"
+"\" per a seguir-los)\n"
#: wt-status.c:1655
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n"
+msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
#: wt-status.c:1658
#, c-format
msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
#: wt-status.c:1780
-#, fuzzy
msgid "No commits yet on "
-msgstr "No s'ha fet cap ordre."
+msgstr "No s'ha fet cap comissió encara a "
#: wt-status.c:1784
msgid "HEAD (no branch)"
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
-msgstr "s'ha produït un error en desenllaçar '%s'"
+msgstr "s'ha produït un error en desenllaçar «%s»"
#: builtin/add.c:24
msgid "git add [<options>] [--] <pathspec>..."
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
#: builtin/add.c:97
#, c-format
msgid "remove '%s'\n"
-msgstr "elimina '%s'\n"
+msgstr "elimina «%s»\n"
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir '%s' per a escriptura."
+msgstr "No s'ha pogut obrir «%s» per a escriptura."
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
-msgstr "No s'ha pogut fer stat a '%s'"
+msgstr "No s'ha pogut fer stat a «%s»"
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
-msgstr "No s'ha pogut aplicar '%s'"
+msgstr "No s'ha pogut aplicar «%s»"
-#: builtin/add.c:249
+#: builtin/add.c:251
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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
msgstr "registra només el fet de que el camí s'afegirà més tard"
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:281
+#: builtin/add.c:283
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:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:284
+#: builtin/add.c:286
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:285
+#: builtin/add.c:287
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:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
-#: builtin/add.c:288
-#, fuzzy
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
-msgstr "crea un dipòsit nu"
+msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:331
-#, fuzzy, c-format
+#: builtin/add.c:333
+#, c-format
msgid "adding embedded git repository: %s"
-msgstr "--stdin requereix d'un dipòsit git"
+msgstr "s'està afegint un dipòsit incrustat: %s"
-#: builtin/add.c:349
+#: builtin/add.c:351
#, 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:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
-#: builtin/add.c:401
+#: builtin/add.c:403
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:405
+#: builtin/add.c:407
#, 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"
+msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir 'git add .'?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
+msgstr "s'ha suprimit «%s» pel ganxo applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
-msgstr "Línia d'entrada mal formada: '%s'."
+msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "S'ha produït un error en copiar les notes de '%s' a '%s'"
+msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
-msgstr "no s'ha pogut analitzar el pedaç '%s'"
+msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:842
+#: builtin/am.c:851
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:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
-msgstr "s'ha produït un error en crear el directori '%s'"
+msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, 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:1172
+#: builtin/am.c:1194
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
-#: builtin/am.c:1173
+#: builtin/am.c:1195
#, 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:1304
-#, fuzzy
+#: builtin/am.c:1302
msgid "Patch is empty."
-msgstr "El pedaç actual està buit."
+msgstr "El pedaç està buit."
-#: builtin/am.c:1370
-#, fuzzy, c-format
+#: builtin/am.c:1368
+#, c-format
msgid "invalid ident line: %.*s"
-msgstr "línia d'identitat no vàlida: %s"
+msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1584
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:1588
+#: builtin/am.c:1586
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:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1613
+#: builtin/am.c:1611
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
-#: builtin/am.c:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
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:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, 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:1915
+#: builtin/am.c:1913
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1922
+#: builtin/am.c:1920
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
-msgstr "No s'ha pogut analitzar l'objecte '%s'."
+msgstr "No s'ha pogut analitzar l'objecte «%s»."
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2227
+#: builtin/am.c:2226
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:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2240
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:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
msgstr "passa-ho a través del git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2276
+#: builtin/am.c:2275
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:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2287
+#: builtin/am.c:2286
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:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
msgstr "(ús intern per al git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
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."
"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:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
-msgstr "no s'ha pogut crear el fitxer d'arxiu '%s'"
+msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opcions>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-"s'està suprimint la branca '%s' que s'ha\n"
-" fusionat a '%s', però encara no\n"
+"s'està suprimint la branca «%s» que s'ha\n"
+" fusionat a «%s», però encara no\n"
" s'ha fusionat a HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-"no s'està suprimint la branca '%s' que encara no\n"
-" s'ha fusionat a '%s', encara que està\n"
+"no s'està suprimint la branca «%s» que encara no\n"
+" s'ha fusionat a «%s», encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
-msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
+msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-"La branca '%s' no està totalment fusionada.\n"
+"La branca «%s» no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "No es pot suprimir la branca '%s' agafada a '%s'"
+msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
-msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
+msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
-msgstr "no s'ha trobat la branca '%s'."
+msgstr "no s'ha trobat la branca «%s»."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Error en suprimir la branca amb seguiment remot '%s'"
+msgstr "Error en suprimir la branca amb seguiment remot «%s»"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
-msgstr "Error en suprimir la branca '%s'"
+msgstr "Error en suprimir la branca «%s»"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "no s'ha pogut analitzar la cadena de format"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "no es pot copiar branca actual mentre no s'és a cap."
+
+#: builtin/branch.c:472
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
-#: builtin/branch.c:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
-msgstr "Nom de branca no vàlid: '%s'"
+msgstr "Nom de branca no vàlid: «%s»"
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "La còpia de la branca ha fallat"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "S'ha copiat el nom de la branca mal anomenada «%s»"
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "S'ha canviat el nom de la branca mal anomenada '%s'"
+msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:506
+#: builtin/branch.c:528
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"La branca està copiada, però l'actualització del fitxer de configuració ha "
+"fallat"
+
+#: builtin/branch.c:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"S'eliminaran les línies que comencin amb '%c'.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "canvia la informació de font"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "no usar"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
msgstr "Desestableix la informació de font"
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:579
+#: builtin/branch.c:603
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
-#: builtin/branch.c:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copia una branca i el seu registre de referència"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copia una branca, encara que el destí existeixi"
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "clau"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:686
+#: builtin/branch.c:713
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una branca"
-#: builtin/branch.c:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "Encara no hi ha cap comissió en la branca '%s'."
+msgstr "Encara no hi ha cap comissió en la branca «%s»."
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
-msgstr "No hi ha branca amb nom '%s'."
+msgstr "No hi ha cap branca amb nom «%s»."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "hi ha massa branques per a una operació de canvi de nom"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "hi ha massa branques per a una operació de còpia"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "hi ha massa branques per a establir una nova font"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "hi ha massa arguments per a una operació remota"
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "hi ha massa arguments per a establir una nova font"
+
+#: builtin/branch.c:756
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
-msgstr "no hi ha tal branca '%s'"
+msgstr "no hi ha tal branca «%s»"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
#, c-format
msgid "branch '%s' does not exist"
-msgstr "la branca '%s' no existeix"
+msgstr "la branca «%s» no existeix"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "hi ha massa branques per a desestablir la font"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "hi ha massa arguments per a desestablir la font"
-#: builtin/branch.c:743
+#: builtin/branch.c:779
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:749
+#: builtin/branch.c:785
#, c-format
msgid "Branch '%s' has no upstream information"
-msgstr "La branca '%s' no té informació de font"
+msgstr "La branca «%s» no té informació de font"
-#: builtin/branch.c:763
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
-#: builtin/branch.c:772
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --"
-"track o --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"\n"
-"Si volíeu fer '%s' seguir '%s', feu això:\n"
-"\n"
+"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
+"upstream-to."
#: builtin/bundle.c:45
#, c-format
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
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:566
+#: builtin/cat-file.c:568
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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "usa un camí específic per a --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
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:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
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:576
+#: builtin/cat-file.c:578
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:579
+#: builtin/cat-file.c:581
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:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
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:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr "cadena"
#: builtin/checkout.c:135 builtin/checkout.c:168
#, c-format
msgid "path '%s' does not have our version"
-msgstr "el camí '%s' no té la nostra versió"
+msgstr "el camí «%s» no té la nostra versió"
#: builtin/checkout.c:137 builtin/checkout.c:170
#, c-format
msgid "path '%s' does not have their version"
-msgstr "el camí '%s' no té la seva versió"
+msgstr "el camí «%s» no té la seva versió"
#: builtin/checkout.c:153
#, c-format
msgid "path '%s' does not have all necessary versions"
-msgstr "el camí '%s' no té totes les versions necessàries"
+msgstr "el camí «%s» no té totes les versions necessàries"
#: builtin/checkout.c:197
#, c-format
msgid "path '%s' does not have necessary versions"
-msgstr "el camí '%s' no té les versions necessàries"
+msgstr "el camí «%s» no té les versions necessàries"
#: builtin/checkout.c:214
#, c-format
msgid "path '%s': cannot merge"
-msgstr "camí '%s': no es pot fusionar"
+msgstr "camí «%s»: no es pot fusionar"
#: builtin/checkout.c:231
#, 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:253 builtin/checkout.c:256 builtin/checkout.c:259
#: builtin/checkout.c:262
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' no es pot usar amb actualització de camins"
+msgstr "«%s» no es pot usar amb actualització de camins"
#: builtin/checkout.c:265 builtin/checkout.c:268
#, c-format
msgid "'%s' cannot be used with %s"
-msgstr "'%s' no es pot usar amb %s"
+msgstr "«%s» no es pot usar amb %s"
#: builtin/checkout.c:271
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada."
+"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
#: builtin/checkout.c:342 builtin/checkout.c:349
#, c-format
msgid "path '%s' is unmerged"
-msgstr "el camí '%s' està sense fusionar"
+msgstr "el camí «%s» està sense fusionar"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
-msgstr "No es pot fer reflog per a '%s': %s\n"
+msgstr "No es pot fer reflog per a «%s»: %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
-msgstr "Restableix la branca '%s'\n"
+msgstr "Restableix la branca «%s»\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
#, c-format
msgid "Already on '%s'\n"
-msgstr "Ja en '%s'\n"
+msgstr "Ja en «%s»\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to and reset branch '%s'\n"
-msgstr "S'ha canviat i restablert a la branca '%s'\n"
+msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
#, c-format
msgid "Switched to a new branch '%s'\n"
-msgstr "S'ha canviat a la branca nova '%s'\n"
+msgstr "S'ha canviat a la branca nova «%s»\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
#, c-format
msgid "Switched to branch '%s'\n"
-msgstr "S'ha canviat a la branca '%s'\n"
+msgstr "S'ha canviat a la branca «%s»\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
-"Si la voleu retenir creant una branca nova, ara pot ser un bon moment\n"
+"Si la voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
"per a fer-ho amb:\n"
"\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
msgstr[1] ""
-"Si les voleu retenir creant una branca nova, ara pot ser un bon moment\n"
+"Si les voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
"per a fer-ho amb:\n"
"\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' no es pot usar amb canvi de branca"
+msgstr "«%s» no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' no es pot usar amb '%s'"
+msgstr "«%s» no es pot usar amb «%s»"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "No es pot canviar la branca a la no comissió '%s'"
+msgstr "No es pot canviar la branca a la no comissió «%s»"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevol modificació local)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, 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'"
+msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Adéu.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:828
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr "força"
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:938
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han "
"indicat; refusant netejar"
-#: builtin/clean.c:941
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "especificació de camí"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc del HEAD del remot"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
#: builtin/pull.c:205
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
#: parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"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:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
-msgstr "info: No s'ha pogut afegir un alternatiu per a '%s': %s\n"
+msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
-msgstr "s'ha produït un error en obrir '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha produït un error en fer stat a '%s'\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
-msgstr "s'ha produït un error en crear l'enllaç '%s'"
+msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "s'ha produït un error en copiar el fitxer a '%s'"
+msgstr "s'ha produït un error en copiar el fitxer a «%s»"
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, 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:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:720
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:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
-msgstr "el dipòsit '%s' no existeix"
+msgstr "el dipòsit «%s» no existeix"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, 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."
+msgstr "el camí destí «%s» ja existeix i no és un directori buit."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
-msgstr "l'arbre de treball '%s' ja existeix."
+msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
-msgstr "no s'han pogut crear els directoris inicials de '%s'"
+msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
-msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
+msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "S'està clonant al dipòsit nu '%s'...\n"
+msgstr "S'està clonant al dipòsit nu «%s»...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "S'està clonant a '%s'...\n"
+msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
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:1069
+#: builtin/clone.c:1073
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:1071
+#: builtin/clone.c:1075
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:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, 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:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
"Llavors \"git cherry-pick --continue\" reprendrà\n"
"com a «cherry pick» les comissions restants.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
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:587
#, c-format
msgid "commit '%s' lacks author header"
-msgstr "a la comissió '%s' li manca la capçalera d'autor"
+msgstr "a la comissió «%s» li manca la capçalera d'autor"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
-msgstr "la comissió '%s' té una línia d'autor mal formada"
+msgstr "la comissió «%s» té una línia d'autor mal formada"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"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:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, 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:711
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:715
#, c-format
msgid "could not read log file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
"Si us plau, introduïu el missatge de comissió dels vostres canvis.\n"
-"Es retindran les línies començants amb '%c'; podeu eliminar-les vosaltres\n"
+"Es mantindran les línies que comencin amb '%c'; podeu eliminar-les "
+"vosaltres\n"
"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, 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"
+"--author
«%s» no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr "Mode de fitxers no seguits no vàlid '%s'"
+msgstr "Mode de fitxers no seguits no vàlid «%s»"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
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:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
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:1180
+#: builtin/commit.c:1187
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:1188
+#: builtin/commit.c:1195
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:1205
+#: builtin/commit.c:1212
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:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1346
-#, fuzzy
+#: builtin/commit.c:1353
msgid "show stash information"
-msgstr "mostra la informació de branca"
+msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
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:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr "data"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
"especificada"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
"especificada"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "com suprimir els espais i #comentaris del missatge"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els ganxos de precomissió i missatge de comissió"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de post escriptura"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1756
#, 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:1800
+#: builtin/commit.c:1761
+#, 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:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
#: builtin/config.c:77
msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "troba l'ajust de color: ranura [stdout-és-tty]"
+msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
#: builtin/config.c:78
msgid "Type"
"#\temail = %s\n"
#: builtin/config.c:499
-#, fuzzy
msgid "--local can only be used inside a git repository"
-msgstr "--cached fora d'un dipòsit"
+msgstr "--local només es pot usar dins d'un dipòsit git"
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
-msgstr "no es pot crear el fitxer de configuració '%s'"
+msgstr "no es pot crear el fitxer de configuració %s"
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"no es pot sobreescriure múltiples valors amb un sol valor\n"
" Useu una expressió regular, --add o --replace-all per a canviar %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
msgid "annotated"
msgstr "anotat"
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'etiqueta anotada %s no té nom incrustat"
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
-msgstr "l'etiqueta '%s' realment és '%s' aquí"
+msgstr "l'etiqueta «%s» realment és «%s» aquí"
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de '%s' vàlid"
+msgstr "%s no és un objecte de «%s» vàlid"
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
-msgstr "cap etiqueta coincideix exactament amb '%s'"
+msgstr "cap etiqueta coincideix exactament amb «%s»"
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr "s'està cercant per a descriure %s\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "s'ha finalitzat la cerca a %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-"Cap etiqueta anotada pot descriure '%s'.\n"
+"Cap etiqueta anotada pot descriure «%s».\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-"Cap etiqueta pot descriure '%s'.\n"
+"Cap etiqueta pot descriure «%s».\n"
"Proveu --always, o creeu algunes etiquetes."
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
"s'ha renunciat la cerca a %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr "troba l'etiqueta que vingui després de la comissió"
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr "usa qualsevol referència"
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr "sempre usa el format llarg"
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr "només segueix la primera mare"
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr "No s'ha trobat cap nom, no es pot descriure res."
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken és incompatible amb les comissions"
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
-msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic"
+msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
-msgstr "s'ha donat un objecte no vàlid '%s'."
+msgstr "s'ha donat un objecte no vàlid «%s»."
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
-msgstr "s'ha donat més de dos blobs: '%s"
+msgstr "s'ha donat més de dos blobs: «%s»"
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
-msgstr "s'ha donat l'objecte no gestionat '%s'."
+msgstr "s'ha donat l'objecte no gestionat «%s»."
#: builtin/difftool.c:29
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "ha fallat: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
-msgstr "s'han modificat ambdós fitxers: '%s' i '%s'."
+msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a %s'."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr "<tool>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "<command>"
msgstr "<command>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "especifiqueu una ordre personalitzada per veure diffs"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcions-de-llista-de-revisions]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Imprimeix l'arbre complet de cada comissió"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Usa la característica done per a acabar el corrent"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Aplica l'especificació de referència a les referències exportades"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr "aprofundeix la història d'un clon superficial basat en temps"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr "directori"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, 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:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, 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:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, 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:997
+#: builtin/fetch.c:1019
#, 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:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mutualment exclusius"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
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:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (en desús)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr "fitxer del qual llegir"
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respecta els colors del format"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "imprimeix només les referències que assenyalin l'objecte donat"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "imprimeix només les referències que s'han fusionat"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "imprimeix només les referències que no s'han fusionat"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "imprimeix només les referències que continguin la comissió"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "imprimeix només les referències que no continguin la comissió"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "S'ha produït un error en fer fstat %s: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "No es pot fer stat en %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"S'està empaquetant el dipòsit automàticament en el fons per rendiment "
"òptim.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu \"git help gc\" per neteja manual.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ja s'està executant en la màquina
'%s' pid %<PRIuMAX> (useu --force si no)"
+"gc ja s'està executant en la màquina
«%s» pid %<PRIuMAX> (useu --force si no)"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: s'ha produït un error en crear fil: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, 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:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció `%c' espera un valor numèric"
-#: builtin/grep.c:999
+#: builtin/grep.c:781
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:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nom base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "anteposa això a la sortida del nom base del projecte pare"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
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:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
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:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
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:1065
+#: builtin/grep.c:844
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:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
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:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
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:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1250
-#, fuzzy
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
-msgstr "no hi ha suport de fils, s'està ignorant %s"
+msgstr "no hi ha suport de fils, s'està ignorant --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
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:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr "opció no admesa amb --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
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:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
#: builtin/help.c:67
#, c-format
msgid "unrecognized help format '%s'"
-msgstr "format d'ajuda no reconegut '%s'"
+msgstr "format d'ajuda no reconegut «%s»"
#: builtin/help.c:94
msgid "Failed to start emacsclient."
#: builtin/help.c:115
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
-msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
+msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
-msgstr "s'ha produït un error en executar '%s'"
+msgstr "s'ha produït un error en executar «%s»"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-"'%s': camí a un visualitzador de manuals no compatible.\n"
+"«%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:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-"'%s': ordre per a un visualitzador de manuals compatible.\n"
+"«%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:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
-msgstr "'%s': visualitzador de manuals desconegut."
+msgstr "«%s»: visualitzador de manuals desconegut."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
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 nova)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' és un àlies de `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "«%s» és un àlies de «%s»"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: tipus %s esperat, %s trobat"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, 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:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "el paquet supera la mida màxima permesa"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear '%s'"
+msgstr "no s'ha pogut crear «%s»"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
-msgstr "no es pot obrir el fitxer de paquet '%s'"
+msgstr "no es pot obrir el fitxer de paquet «%s»"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, 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:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr ""
"desbordament de valor de desplaçament per a l'objecte base de diferències"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[1] ""
"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Error en objecte"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, 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:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d diferència no resolta"
msgstr[1] "El paquet té %d diferències no resoltes"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "error en tancar el fitxer de paquet"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
-msgstr "no es pot escriure el fitxer a retenir '%s'"
+msgstr "no es pot escriure el fitxer a mantenir «%s»"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
-msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
+msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer de paquet"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> dolent"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
-msgstr "No es pot obrir el fitxer de paquet existent '%s'"
+msgstr "No es pot obrir el fitxer de paquet existent «%s»"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
-msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'"
+msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "sense diferències: %d objecte"
msgstr[1] "sense diferències: %d objectes"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longitud de cadena = %d: %lu objecte"
msgstr[1] "longitud de cadena = %d: %lu objectes"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
-msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
msgstr "%s dolent"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
msgstr "--stdin requereix d'un dipòsit git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
-msgstr "no es pot fer stat en '%s'"
+msgstr "no es pot fer stat en «%s»"
#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
-msgstr "no es pot fer stat en la plantilla '%s'"
+msgstr "no es pot fer stat en la plantilla «%s»"
#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
-msgstr "no es pot fer opendir en el directori '%s'"
+msgstr "no es pot fer opendir en el directori «%s»"
#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
-msgstr "no es pot fer readlink en '%s'"
+msgstr "no es pot fer readlink en «%s»"
#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
-msgstr "no es pot fer symlink en '%s' '%s'"
+msgstr "no es pot fer symlink en «%s» «%s»"
#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
-msgstr "no es pot copiar '%s' a '%s'"
+msgstr "no es pot copiar «%s» a «%s»"
#: builtin/init-db.c:89
#, c-format
#: builtin/init-db.c:135
#, c-format
msgid "not copying templates from '%s': %s"
-msgstr "no s'està copiant plantilles de '%s': %s"
+msgstr "no s'està copiant plantilles de «%s»: %s"
#: builtin/init-db.c:328
#, c-format
#: builtin/init-db.c:574
#, c-format
msgid "Cannot access work tree '%s'"
-msgstr "No es pot accedir a l'arbre de treball '%s'"
+msgstr "No es pot accedir a l'arbre de treball «%s»"
#: builtin/interpret-trailers.c:15
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "edita els fitxers in situ"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "escurça els remolcs buits"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+#, fuzzy
+msgid "action if trailer already exists"
+msgstr "l'arbre de treball '%s' ja existeix."
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+#, fuzzy
+msgid "output only the trailers"
+msgstr "escurça els remolcs buits"
+
+#: builtin/interpret-trailers.c:103
+#, fuzzy
+msgid "do not apply config rules"
+msgstr "cerca les variables de configuració"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "estableix les opcions d'anàlisis"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "remolc"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "remolcs a afegir"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+#, fuzzy
+msgid "--trailer with --only-input does not make sense"
+msgstr "--name-only no té sentit"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer dolent"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr "No es pot llegir l'objecte %s"
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr "Tipus desconegut: %d"
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr "Cal exactament un rang."
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr "No és un rang."
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
-msgstr "S'ha produït un error en resoldre '%s' com a referència vàlida."
+msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1284
+#: builtin/log.c:1288
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"
"seguir una branca remota. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
-#: builtin/log.c:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr "S'ha produït un error en trobar la base exacta de fusió."
-#: builtin/log.c:1315
+#: builtin/log.c:1319
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:1319
+#: builtin/log.c:1323
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:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1425
+#: builtin/log.c:1431
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:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1436
+#: builtin/log.c:1442
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:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1446
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:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1460
+#: builtin/log.c:1466
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:1462
+#: builtin/log.c:1468
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:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1472
+#: builtin/log.c:1478
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:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1475
+#: builtin/log.c:1481
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:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1489
+#: builtin/log.c:1495
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:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "mostra el progrés durant la generació de pedaços"
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
-msgstr "No s'ha pogut crear el directori '%s'"
+msgstr "No s'ha pogut crear el directori «%s»"
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
+msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
+
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "S'estan generant els pedaços"
-#: builtin/log.c:1794
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr "S'ha produït un error en crear els fitxers de sortida"
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
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:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
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:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
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:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
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:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr "mostra les dades de depuració"
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
-msgstr ""
+msgstr "mbox buit: «%s»"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "l'opció `m' requereix un valor"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
-msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n"
+msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "mostra les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
"de fusió"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
#: builtin/revert.c:109
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+#, fuzzy
+msgid "verify commit-msg hook"
+msgstr "evita els ganxos de precomissió i missatge de comissió"
+
+#: builtin/merge.c:265
msgid "could not run stash."
-msgstr "no s'ha pogut executar stash."
+msgstr "no s'ha pogut executar «stash»."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
-msgstr "l'emmagatzemament ha fallat"
+msgstr "l'«stash» ha fallat"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (res a fer «squash»)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
-msgstr "'%s' no assenyala una comissió"
+msgstr "«%s» no assenyala una comissió"
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions dolenta: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:666
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.c:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opció desconeguda de merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
-msgstr "No s'ha pogut llegir de '%s'"
+msgstr "No s'ha pogut llegir de «%s»"
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
"avorta la comissió.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:893
+#: builtin/merge.c:914
msgid "No default upstream defined for the current branch."
msgstr "No hi ha cap font per defecte definida per a la branca actual."
-#: builtin/merge.c:898
+#: builtin/merge.c:919
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-#: builtin/merge.c:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
-msgstr "Valor dolent '%s' en l'entorn '%s'"
+msgstr "Valor dolent «%s» en l'entorn «%s»"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr "--abort no accepta paràmetres"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr "--continue no accepta paràmetres"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar només una comissió a un HEAD buit"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La comissió %s té una signatura GPG bona de %s\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, 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:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, 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:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#: builtin/merge-recursive.c:51
#, c-format
msgid "could not parse object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte '%s'"
+msgstr "no s'ha pogut analitzar l'objecte «%s»"
#: builtin/merge-recursive.c:55
#, c-format
#: 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'"
+msgstr "no s'ha pogut resoldre la referència «%s»"
#: builtin/merge-recursive.c:77
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels "
+"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stash» dels "
"mateixos per a procedir"
#: builtin/mv.c:103
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
-msgstr "el destí '%s' no és un directori"
+msgstr "el destí «%s» no és un directori"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
-msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n"
+msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "font dolenta"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "el directori font està buit"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "no està sota control de versions"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "el destí existeix"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
-msgstr "s'està sobreescrivint '%s'"
+msgstr "s'està sobreescrivint «%s»"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "múltiples fonts per al mateix destí"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
-msgstr "el canvi del nom de '%s' ha fallat"
+msgstr "el canvi del nom de «%s» ha fallat"
#: builtin/name-rev.c:338
msgid "git name-rev [<options>] <commit>..."
#: builtin/notes.c:148
#, c-format
msgid "unable to start 'show' for object '%s'"
-msgstr "no s'ha pogut iniciar 'show' per a l'objecte '%s'"
+msgstr "no s'ha pogut iniciar 'show' per a l'objecte «%s»"
#: builtin/notes.c:152
msgid "could not read 'show' output"
#: builtin/notes.c:160
#, c-format
msgid "failed to finish 'show' for object '%s'"
-msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte '%s'"
+msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte «%s»"
#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
-msgstr "no es pot llegir '%s'"
+msgstr "no es pot llegir «%s»"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
-msgstr "no s'ha pogut obrir o llegir '%s'"
+msgstr "no s'ha pogut obrir o llegir «%s»"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
-msgstr "s'ha produït un error en resoldre '%s' com a referència vàlida."
+msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
#: builtin/notes.c:258
#, c-format
msgid "failed to read object '%s'."
-msgstr "s'ha produït un error en llegir l'objecte '%s'."
+msgstr "s'ha produït un error en llegir l'objecte «%s»."
#: builtin/notes.c:262
#, 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'."
+msgstr "no es pot llegir les dades de node de l'objecte no de blob «%s»."
#: builtin/notes.c:302
#, c-format
msgid "malformed input line: '%s'."
-msgstr "línia d'entrada mal formada: '%s'."
+msgstr "línia d'entrada mal formada: «%s»."
#: builtin/notes.c:317
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr "s'ha produït un error en copiar les notes de '%s' a '%s'"
+msgstr "s'ha produït un error 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:348
+#: builtin/notes.c:349
#, 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "massa paràmetres"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, 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:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "llegeix els objectes des d'stdin"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, 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:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
"actual (%s)"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
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:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
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:31
+#: builtin/pack-objects.c:32
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:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
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:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1069
+#: 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:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr "S'estan comprimint objectes"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
-msgstr "versió d'índex dolenta '%s'"
+msgstr "versió d'índex dolenta «%s»"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
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:2884
+#: builtin/pack-objects.c:2890
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:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr "versió[,desplaçament]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
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:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer de paquet de sortida"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr ""
"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
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:2899
+#: builtin/pack-objects.c:2905
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longitud màxima de la cadena de diferències permesa en el paquet resultant"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de diferències"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
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:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
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:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
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:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
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:2948
+#: builtin/pack-objects.c:2954
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:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
msgid "prune loose refs (default)"
msgstr "poda les referències soltes (per defecte)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "S'estan eliminant objectes duplicats"
msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/pull.c:124
-#, fuzzy
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
#: builtin/pull.c:164
msgid "automatically stash/stash pop before and after rebase"
-msgstr "automàticament emmagatzema/desempila abans i després de fer «rebase»"
+msgstr ""
+"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
#: builtin/pull.c:180
msgid "Options related to fetching"
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:403
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
"acabeu d'obtenir."
-#: builtin/pull.c:401
+#: builtin/pull.c:405
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:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"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:405
+#: builtin/pull.c:409
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"a branch. Because this is not the default configured remote\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
-"Heu demanat baixar del remot '%s', però no heu especificat cap branca.\n"
+"Heu demanat baixar del remot «%s», però no heu especificat cap branca.\n"
"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:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 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."
+msgstr "Si us plau, especifiqueu amb quina branca voleu fusionar."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 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:434 git-parse-remote.sh:95
+#: builtin/pull.c:438 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:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-"La vostra configuració especifica fusionar amb la referència '%s'\n"
+"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:852
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:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
msgstr "si us plau, cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
-"l'obtenció ha actualitzat el cap de la branca actual.\n"
+"l'obtenció ha actualitzat HEAD de la branca actual.\n"
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
-"Esteu pujant al remot '%s', que no és la font de la vostra\n"
-"branca actual '%s', sense dir-me què pujar per a actualitzar\n"
+"Esteu pujant al remot «%s», que no és la font de la vostra\n"
+"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
#: builtin/push.c:246
#: builtin/push.c:339
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr "s'ha produït un error en pujar algunes referències a '%s'"
+msgstr "s'ha produït un error en pujar algunes referències a «%s»"
#: builtin/push.c:370
#, c-format
msgid "bad repository '%s'"
-msgstr "dipòsit dolent '%s'"
+msgstr "dipòsit dolent «%s»"
#: builtin/push.c:371
msgid ""
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<opcions>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "mantén les comissions buides"
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr "continua el «rebase»"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr "avorta el «rebase»"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "fes un script de «rebase»"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "escurça els SHA-1 en la llista per a fer"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "expandeix els SHA-1 en la llista per a fer"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "comprova la llista a fer"
+
+#: builtin/rebase--helper.c:36
+#, fuzzy
+msgid "skip unnecessary picks"
+msgstr "No s'ha pogut ometre ordres innecessaris d'elecció"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
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"
"recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
"alguna altra manera per a coincidir amb el que hàgiu pujat.\n"
"\n"
-"Per a silenciar aquest missatge i encara retenir el comportament\n"
+"Per a silenciar aquest missatge i mantenir el el comportament\n"
"predeterminat, establiu la variable de configuració\n"
"'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
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"
"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
#: builtin/reflog.c:424
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' per a '%s' no és una marca de temps vàlida"
+msgstr "«%s» per a «%s» no és una marca de temps vàlida"
#: builtin/reflog.c:541 builtin/reflog.c:546
#, c-format
msgid "'%s' is not a valid timestamp"
-msgstr "'%s' no és una marca de temps vàlida"
+msgstr "«%s» no és una marca de temps vàlida"
#: builtin/remote.c:13
msgid "git remote [-v | --verbose]"
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
-msgstr "'%s' no és un nom de remot vàlid"
+msgstr "«%s» no és un nom de remot vàlid"
#: builtin/remote.c:235
#, c-format
msgid "Could not setup master '%s'"
-msgstr "No s'ha pogut configurar la mestra '%s'"
+msgstr "No s'ha pogut configurar la mestra «%s»"
#: builtin/remote.c:337
#, c-format
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "No hi ha tal remot: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
-msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'"
+msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tSi us plau, actualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
-msgstr "la supressió de '%s' ha fallat"
+msgstr "la supressió de «%s» ha fallat"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
-msgstr "la creació de '%s' ha fallat"
+msgstr "la creació de «%s» ha fallat"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
-msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
+msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(sense URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(no consultat)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(desconegut)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a 'git pull':"
msgstr[1] " Branques locals configurades per a 'git pull':"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
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:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
-msgstr "No hi ha tal remot '%s'"
+msgstr "No hi ha tal remot «%s»"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
-msgstr "cap URL configurat per al remot '%s'"
+msgstr "cap URL configurat per al remot «%s»"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
msgstr "limita la profunditat màxima de les diferències"
#: builtin/repack.c:196
-#, fuzzy
msgid "limits the maximum number of threads"
-msgstr "limita la profunditat màxima de les diferències"
+msgstr "limita el nombre màxim de fils"
#: builtin/repack.c:198
msgid "maximum size of each packfile"
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
-msgstr "s'ha produït un error en eliminar '%s'"
+msgstr "s'ha produït un error en eliminar «%s»"
#: builtin/replace.c:20
msgid "git replace [-f] <object> <replacement>"
#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
#, c-format
msgid "Not a valid object name: '%s'"
-msgstr "No és un nom d'objecte vàlid: '%s'"
+msgstr "No és un nom d'objecte vàlid: «%s»"
#: builtin/replace.c:361
#, c-format
msgid "bad mergetag in commit '%s'"
-msgstr "etiqueta de fusió dolenta en la comissió '%s'"
+msgstr "etiqueta de fusió dolenta en la comissió «%s»"
#: builtin/replace.c:363
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "etiqueta de fusió mal formada en la comissió '%s'"
+msgstr "etiqueta de fusió mal formada en la comissió «%s»"
#: builtin/replace.c:374
#, c-format
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; "
+"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
"useu --edit en lloc de --graft"
#: builtin/replace.c:407
#, c-format
msgid "the original commit '%s' has a gpg signature."
-msgstr "la comissió original '%s' té una signatura gpg."
+msgstr "la comissió original «%s» té una signatura gpg."
#: builtin/replace.c:408
msgid "the signature will be removed in the replacement commit!"
#: builtin/replace.c:414
#, c-format
msgid "could not write replacement commit for: '%s'"
-msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'"
+msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
#: builtin/replace.c:438
msgid "list replace refs"
msgid "keep"
msgstr "reteniment"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "S'ha produït un error en trobar l'arbre de HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "S'ha produït un error en cercar l'arbre de %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "restableix només HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr "registra només el fet de que els camins eliminats s'afegiran després"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
-msgstr "S'ha produït un error en resoldre '%s' com a revisió vàlida."
+msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
-msgstr "S'ha produït un error en resoldre '%s' com a arbre vàlid."
+msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc "
"d'això."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "el restabliment de %s no es permet en un dipòsit nu"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
-msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió '%s'."
+msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "retén el `--` passat com a paràmetre"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
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:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"\n"
-"(useu --cached per a retenir el fitxer, o -f per a forçar l'eliminació)"
+"(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
#: builtin/rm.c:225
msgid "the following file has local modifications:"
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
-msgstr "no s'està eliminant '%s' recursivament sense -r"
+msgstr "no s'està eliminant «%s» recursivament sense -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no s'ha pogut eliminar %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
-msgstr "no s'ha pogut suprimir '%s'"
+msgstr "no s'ha pogut suprimir «%s»"
#: builtin/send-pack.c:19
msgid ""
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr ""
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "ordena la sortida segons el nombre de comissions per autor"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Omet les descripcions de comissió, només proveeix el recompte de comissions"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Mostra l'adreça de correu electrònic de cada autor"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
#: builtin/show-branch.c:635
msgid "suppress naming strings"
-msgstr "omet l'anomenar cadenes"
+msgstr "omet anomenar cadenes"
#: builtin/show-branch.c:637
msgid "include the current branch"
#: builtin/show-branch.c:812
#, c-format
msgid "'%s' is not a valid ref."
-msgstr "'%s' no és una referència vàlida."
+msgstr "«%s» no és una referència vàlida."
#: builtin/show-branch.c:815
#, c-format
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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
-msgstr "no es pot despullar un component de l'url '%s'"
+msgstr "no es pot despullar un component de l'url «%s»"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, 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"
+msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "S'ha produït un error en registrar l'url per al camí de submòdul '%s'"
+msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, 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"
+msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, 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"
+"«%s»\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha produït un error en registrar el mode d'actualització per al camí de "
-"submòdul '%s'"
+"submòdul «%s»"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, 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'"
+msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
-msgstr "el submòdul '%s' no pot afegir un alternatiu: %s"
+msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr "No es reconeix el valor '%s' per a submodule.alternateErrorStrategy"
+msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "No es reconeix el valor '%s' per a submodule.alternateLocation"
+msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
+msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
-msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
+msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr "El camí de submòdul '%s' no està inicialitzat"
+msgstr "El camí de submòdul «%s» no està inicialitzat"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
-msgstr "S'està ometent el submòdul '%s'"
+msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
-msgstr "S'ha produït un error en clonar '%s'. S'ha programat un reintent"
+msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
-msgstr "S'ha produït un error per segon cop en clonar '%s', s'està avortant"
+msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
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:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
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:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
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:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
msgstr "valor dolent per al paràmetre update"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"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:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<camí>]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' no és una subordre vàlida de submodule--helper"
+msgstr "«%s» no és una subordre vàlida de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nom>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "omet el missatge d'error de referències no simbòliques (separades)"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "suprimeix la referència simbòlica"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "escurça la sortida de referències"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "raó"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "raó de l'actualització"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
-msgstr "no s'ha trobat l'etiqueta '%s'."
+msgstr "no s'ha trobat l'etiqueta «%s»."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
-msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n"
+msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
" %s\n"
"Les línies que comencin amb '%c' s'ignoraran.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "el tipus d'objecte és dolent."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "es permet l'opció -n només amb mode llista"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "es permet l'opció --contains només amb mode llista"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "es permet l'opció --no-contains només amb mode llista"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "es permet --points-at option només amb mode llista"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
-msgstr "'%s' no és un nom d'etiqueta vàlid."
+msgstr "«%s» no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
-msgstr "l'etiqueta '%s' ja existeix"
+msgstr "l'etiqueta «%s» ja existeix"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
-msgstr "Etiqueta '%s' actualitzada (era %s)\n"
+msgstr "Etiqueta «%s» actualitzada (era %s)\n"
#: builtin/unpack-objects.c:494
msgid "Unpacking objects"
#: builtin/update-index.c:136
#, c-format
msgid "Testing mtime in '%s' "
-msgstr "S'està provant mtime en '%s' "
+msgstr "S'està provant mtime en «%s» "
#: builtin/update-index.c:150
msgid "directory stat info does not change after adding a new file"
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr "com --refresh, però ignora l'ajust assume-unchanged"
+msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
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:971
+#: builtin/update-index.c:973
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:973
+#: builtin/update-index.c:975
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:975
+#: builtin/update-index.c:977
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:979
+#: builtin/update-index.c:981
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:983
+#: builtin/update-index.c:985
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
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:1008
+#: builtin/update-index.c:1010
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:1108
+#: builtin/update-index.c:1107
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
"voleu habilitar l'índex dividit"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
"voleu inhabilitar l'índex dividit"
-#: builtin/update-index.c:1128
-#, fuzzy
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
-msgstr "La memòria cau no seguida està habilitada per a '%s'"
+msgstr "La memòria cau no seguida està habilitada per a «%s»"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcions>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "suprimeix la referència"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "actualitza <nom de referència>, no la que assenyali"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "stdin té paràmetres acabats amb NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "llegeix les actualitzacions des d'stdin"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "informa dels arbres de treball podats"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "fes caducar els arbres de treball més vells que <hora>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
-msgstr "'%s' ja existeix"
+msgstr "«%s» ja existeix"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
-msgstr "no s'ha pogut crear directori de '%s'"
+msgstr "no s'ha pogut crear directori de «%s»"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "S'està preparant %s (identificador %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mutualment exclusius"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr "raó per bloquejar"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
-msgstr "'%s' no és un arbre de treball"
+msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
msgid "The main working tree cannot be locked or unlocked"
msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
-msgstr "'%s' ja està bloquejat, raó: '%s'"
+msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
-msgstr "'%s' ja està bloquejat"
+msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
-msgstr "'%s' no està bloquejat"
+msgstr "«%s» no està bloquejat"
#: builtin/write-tree.c:14
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després de l'anunci inicial de referència"
-#: upload-pack.c:1045
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
"algunes guies de concepte. Vegeu 'git help <ordre>' o\n"
"'git help <concepte>' per a llegir sobre una subordre o concepte específic."
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:358
+#: http.c:359
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:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
-msgstr "Ja al dia amb $pretty_name"
+msgid "Already up to date with $pretty_name"
+msgstr "Ja està al dia amb $pretty_name"
#: git-merge-octopus.sh:89
#, sh-format
#: git-rebase.sh:58
msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n"
-"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc "
-"d'això.\n"
-"Per a agafar la branca original i deixar de fer «rebase», executeu \"git "
-"rebase --abort\"."
+"Resolgueu tots els conflictes manualment, marqueu-los com a resolts amb\n"
+"\"git add/rm <fitxers amb conflicte>\", llavors executeu \"git rebase --"
+"continue\".\n"
+"Podeu en comptes ometre aquesta comissió: executeu \"git rebase --skip\".\n"
+"Per a avortar i tornar a l'estat anterior abans de l'ordre \"git rebase\", "
+"executeu \"git rebase --abort\"."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "No s'ha pogut tornar a $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "S'ha aplicat el magatzem automàtic."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "No es pot emmagatzemar $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "El ganxo pre-«rebase» ha refusat a fer «rebase»."
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Sembla que git-am està en curs. No es pot fer «rebase»."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "font no vàlida $upstream_name"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hi ha cap base de fusió"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branca actual $branch_name està al dia."
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Canvis de $mb a $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-"Primer, s'està rebobinant el cap per a reproduir el vostre treball al "
-"damunt..."
+"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
msgstr "No es pot desar els fitxers no seguits"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"error: opció desconeguda de 'stash save': $option\n"
" Per a proveir un missatge, useu git stash save -- '$option'"
-#: git-stash.sh:281
+#: git-stash.sh:288
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:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:487
-#, fuzzy
+#: git-stash.sh:495
msgid "No stash entries found."
-msgstr "No s'ha trobat cap magatzem."
+msgstr "No s'ha trobat cap «stash»."
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:560
+#: git-stash.sh:568
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:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:579
-#, fuzzy
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
-msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge"
+msgstr "No s'ha pogut restaurar els fitxers no seguits des del «stash»"
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr "No es pot fer «unstage» dels fitxers modificats"
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:633
-#, fuzzy
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
-msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
+msgstr ""
+"Es conserva l'entrada «stash» en cas de que la necessiteu altra vegada."
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
"L'obtenció directa d'aquella comissió ha fallat."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"S'ha produït un error en recorre recursivament dins del camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
"S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
"comissió\n"
-" x, exec = executa l'ordre (el reste de la línia) usant l'intèrpret "
+" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
"d'ordres\n"
" d, drop = elimina la comissió\n"
"\n"
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No s'ha pogut aplicar $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
"comissió."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, 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:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
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:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "No s'ha pogut ometre ordres innecessaris d'elecció"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Advertència: no es reconeix l'ordre en la línia següent:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
-"Les comissions descartades (més nova a més vella):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
-"comissió.\n"
-"\n"
-"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
-"d'advertències.\n"
-"Els comportaments possibles són: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
-"missingCommitsCheck. S'està ignorant."
-
-#: git-rebase--interactive.sh:1054
-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:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "O podeu avortar el «rebase» amb 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
"la comissió"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n"
"primer cometeu-los i després executeu 'git rebase --continue' de nou."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
msgstr "No s'ha pogut cometre els canvis «staged»."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
msgstr "No s'ha pogut iniciar les comissions reescrites"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, 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:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr "Nota que les comissions buides estan comentades"
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
-"Per suprimir '%s' línies, feu-les línies ' ' (context).\n"
-"Per suprimir '%s' línies, suprimiu-les.\n"
+"Per suprimir «%s» línies, feu-les línies ' ' (context).\n"
+"Per suprimir «%s» línies, suprimiu-les.\n"
"Les línies que comencin per %s seran suprimides.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr "'%s' conté una versió intermèdia del correu que estàveu redactant.\n"
+msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' conté el correu redactat.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No es pot executar git format-patch des de fora del dipòsit\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr "Camp --suppress-cc desconegut: '%s'\n"
+msgstr "Camp --suppress-cc desconegut: «%s»\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
-msgstr "--confirm setting desconegut: '%s'\n"
+msgstr "--confirm setting desconegut: «%s»\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: `:include:` no està suportat: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-"El fitxer '%s' existeix però també pot ser un rang de comissions\n"
+"El fitxer «%s» existeix però també pot ser un rang de comissions\n"
"per produir pedaços. Desambigüeu...\n"
"\n"
" * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
" * Proporcionant l'opció --format-patch si volíeu especificar un rang.\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "S'ha produït un error a l'obrir el directori %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"No s'han especificat fitxers de pedaç\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "S'ha produït un error en obrir per escriptura %s: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Netegeu el contingut del cos si no voleu enviar un resum.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "S'ha produït un error en obrir %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "El correu electrònic de resum està buit, s'omet\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Esteu segur que voleu usar <%s> [y/N]? "
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr "fatal: l'àlias '%s' s'espandeix a si mateix\n"
+msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
"cap)? "
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "el camí CA \"%s\" no existeix"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
msgstr ""
" La llista de Cc de sobre s'ha estès amb adreces addicionals\n"
" trobades al missatge de la comissió del pedaç. Per defecte, \n"
-" send-email pregunta abans d'enviar el missatge quan això succeix.\n"
+" send-email pregunta abans d'enviar el missatge quan això succeeix.\n"
" Aquest comportament està controlat pel paràmetre de configuració\n"
" sendemail.confirm.\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
msgstr "Requereix contestació a l'enviar correu"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
"useu --smtp-debug."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint cc: %s des de la línia '%s'\n"
+msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint a: %s des de la línia '%s'\n"
+msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint cc: %s des de la línia '%s'\n"
+msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr "(cos) S'està afegint cc: %s des de la línia '%s'\n"
+msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
-msgstr "(%s) no s'ha pogut executar '%s'"
+msgstr "(%s) no s'ha pogut executar «%s»"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr "(%s) S'està afegint %s: %s des de: '%s'\n"
+msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
-msgstr "(%s) s'ha produït un error en tancar el conducte '%s'"
+msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
msgstr "codificació de transferència invàlida"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr "S'està ometent %s amb el sufix de còpia de seguretat '%s'.\n"
+msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
-#~ msgid "Could not open file '%s'"
-#~ msgstr "No s'ha pogut obrir el fitxer '%s'"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "en %0.1f segons automàticament..."
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) ha fallat"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Comissió inicial en "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "El pedaç és buit. S'ha dividit malament?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Encara teniu camins sense fusionar en el vostre índex.\n"
-#~ "Heu oblidat d'usar 'git add'?"
-
-#~ 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 ""
-#~ "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ó?"
-
-#~ 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 --only "
-#~ "camins..."
-
-#~ msgid "default mode for recursion"
-#~ msgstr "mode de recursivitat per defecte"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
-
-#, fuzzy
-#~ msgid "object of unknown type"
-#~ msgstr "tipus d'objecte"
-
-#, fuzzy
-#~ msgid "commit object"
-#~ msgstr "Error en objecte"
-
-#, fuzzy
-#~ msgid "tree object"
-#~ msgstr "objecte"
-
-#, fuzzy
-#~ msgid "blob object"
-#~ msgstr "objecte"
-
-#, fuzzy
-#~ msgid "other tag object"
-#~ msgstr "objecte d'arbre massa curt"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "No hi ha res a excloure per patrons :(exclusió).\n"
-#~ "Potser heu oblidat afegir o ':/' o '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "format no reconegut: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= requereix un paràmetre enter positiu"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "la referència '%s' no té %ld components per a :strip"
-
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "format de %.*s desconegut %s"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: no hi és]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: darrere per %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: davant per %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: davant per %d, darrere per %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** referència no vàlida ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "directori d'objectes increïblement llarg %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opcions>] <missatge> HEAD <comissió>"
-
-#~ msgid "'%s' is not a commit"
-#~ msgstr "'%s' no és una comissió"
-
-#~ msgid "cannot open file '%s'"
-#~ msgstr "no es pot obrir el fitxer '%s'"
-
-#~ msgid "could not close file %s"
-#~ msgstr "no s'ha pogut tancar el fitxer %s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "nom d'etiqueta massa llarg: %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "la capçalera d'etiqueta és massa gran."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà "
-#~ "immediatament\n"
-#~ "per descartar-se."
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Usa un heurístic experimental basat en línies en blanc per a millorar les "
-#~ "diferències"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "el submòdul següent (o un dels seus submòduls niats)\n"
-#~ "usa un directori .git:"
-#~ msgstr[1] ""
-#~ "els submòduls següents (o un dels seus submòduls niats)\n"
-#~ "usa un directori .git:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva "
-#~ "història)"
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no accepta paràmetres"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-10-08 09:48+0800\n"
-"PO-Revision-Date: 2017-10-08 11:17-0500\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-16 21:15-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
msgstr ""
"--reverse y --first-parent juntos requieren especificar el ultimo commit"
-#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
#: builtin/shortlog.c:191
msgid "Filtering content"
msgstr "Filtrando contenido"
-#: entry.c:417
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo establecer el archivo '%s'"
msgid "Could not open '%s' for writing"
msgstr "No sepudo abrir '%s' para escritura"
-#: refs.c:1779
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
msgid "ahead %d, behind %d"
msgstr "delante %d, detras %d"
-#: ref-filter.c:104
+#: ref-filter.c:105
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<color>)"
-#: ref-filter.c:106
+#: ref-filter.c:107
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:126
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:130
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:132
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento: %s no reconocido %%(%s)"
-#: ref-filter.c:172
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:179
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no toma ningún argumento"
-#: ref-filter.c:186
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) no toma argumentos"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "%%(trailers) desconocidos, argumento: %s"
-#: ref-filter.c:205
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:207
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %s no reconocido %%(contents)"
-#: ref-filter.c:220
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positivo esperado objectname:short=%s"
-#: ref-filter.c:224
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argumento: %s no reconocido %%(objectname)"
-#: ref-filter.c:251
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:263
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:267
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:273
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:277
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:292
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento: %s no reconocido %%(if)"
-#: ref-filter.c:382
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre malformado de campo: %.*s"
-#: ref-filter.c:408
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:520
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: atomo %%(if) usado sin un atomo %%(then)"
-#: ref-filter.c:580
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: atomo %%(then) usado sin atomo %%(if)"
-#: ref-filter.c:582
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: atomo %%(then) usado mas de una vez"
-#: ref-filter.c:584
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: atomo %%(then) usado despues de %%(else)"
-#: ref-filter.c:610
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: atomo %%(else) usado sin un atomo %%(if)"
-#: ref-filter.c:612
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: atomo %%(else) usado sin un atomo %%(then) "
-#: ref-filter.c:614
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: atomo %%(else) usado mas de una vez"
-#: ref-filter.c:627
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: atomo %%(end) usado sin atomo correspondiente"
-#: ref-filter.c:682
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena malformado %s"
-#: ref-filter.c:1268
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(no hay rama, rebasando %s)"
-#: ref-filter.c:1271
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(no hay rama, comenzando bisectado en %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1279
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD desascoplado en %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1286
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD desacoplado de %s)"
-#: ref-filter.c:1290
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(sin rama)"
-#: ref-filter.c:1439 ref-filter.c:1470
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "objeto %s faltante para %s"
-#: ref-filter.c:1442 ref-filter.c:1473
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:1773
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado en '%s'"
-#: ref-filter.c:1840
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:1845
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
-#: ref-filter.c:2107
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta atomo %%(end)"
-#: ref-filter.c:2201
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto malformado %s"
#: sequencer.c:2561
#, c-format
-msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-"Opcion %s no reconocida para optionrebase.missingCommitsCheck. Ingorando."
+"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ingorando."
#: sequencer.c:2641
#, c-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Realmente deseas mandar %s?[y|N]"
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no toma argumentos"
+
#~ msgid "submodule update strategy not supported for submodule '%s'"
#~ msgstr ""
#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
# to prune | éliminer
# to push | pousser
# to rebase | rebaser
+# trailers | lignes terminales
# repository | dépôt
# remote | distante (ou serveur distant)
# revision | révision
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-23 04:35+0200\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-18 20:28+0200\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: apply.c:836
+#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: apply.c:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: apply.c:967
+#: apply.c:966
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: apply.c:973
+#: apply.c:972
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:974
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:979
+#: apply.c:978
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: apply.c:1008
+#: apply.c:1007
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode invalide dans la ligne %d : %s"
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "lignes d'entête inconsistantes %d et %d"
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: apply.c:1567
+#: apply.c:1566
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: apply.c:1587
+#: apply.c:1586
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
"la suppression de %d composants de préfixe de chemin (ligne %d)"
-#: apply.c:1600
+#: apply.c:1599
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
-#: apply.c:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: apply.c:1848
+#: apply.c:1865
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: apply.c:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3052
+#: apply.c:3077
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
-#: apply.c:3064
+#: apply.c:3089
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: apply.c:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3100
+#: apply.c:3125
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
"inverse"
-#: apply.c:3146
+#: apply.c:3171
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
-#: apply.c:3156
+#: apply.c:3181
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
-#: apply.c:3164
+#: apply.c:3189
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
-#: apply.c:3182
+#: apply.c:3207
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3201
+#: apply.c:3226
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3556
+#: apply.c:3582
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: apply.c:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retour à une fusion à 3 points…\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Echec du retour à une fusion à 3 points…\n"
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3610
+#: apply.c:3636
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3636
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3941
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: apply.c:3946
+#: apply.c:3972
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: apply.c:3966
+#: apply.c:3992
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4076
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4083
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4292
+#: apply.c:4318
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4522
+#: apply.c:4548
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: apply.c:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4874
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr "chemin"
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr "num"
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:4933
+#: apply.c:4959
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: apply.c:4937
+#: apply.c:4963
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: apply.c:4939
+#: apply.c:4965
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:4941
+#: apply.c:4967
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: apply.c:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: apply.c:4951
+#: apply.c:4977
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: apply.c:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr "action"
-#: apply.c:4960
+#: apply.c:4986
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:4978
+#: apply.c:5004
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: apply.c:4981
+#: apply.c:5007
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr "racine"
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "fmt"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr "préfixe"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "fichier"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr "dépôt"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "commande"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s n'est pas un nom valide d'attribut"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"Aucun commit testable n'a été trouvé\n"
"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1001
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
"dernier commit"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-"La branche %s est paramétrée pour suivre la branche distante %s de %s en "
-"rebasant."
+"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "
+"en rebasant."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-"La branche %s est paramétrée pour suivre la branche distante %s depuis %s."
+"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "
+"'%s'."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."
+"La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
+"rebasant."
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "La branche %s est paramétrée pour suivre la branche locale %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-"La branche %s est paramétrée pour suivre la référence distante %s en "
+"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
"rebasant."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "La branche %s est paramétrée pour suivre la référence distante %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
+"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
+"rebasant."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branche %s est paramétrée pour suivre la référence locale %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgid "A branch named '%s' already exists."
msgstr "Une branche nommée '%s' existe déjà."
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr "Impossible de forcer la mise à jour de la branche courante."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
"pas une branche."
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
"pour paramétrer le suivi distant en même temps que vous poussez."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nom d'objet invalide : '%s'."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objet ambigu : '%s'."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Le colis contient cette référence :"
msgstr[1] "Le colis contient ces %d références :"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Le colis enregistre l'historique complet."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Le colis exige cette référence :"
msgstr[1] "Le colis exige ces %d références :"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:1511
+#: commit.c:1517
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr ""
"les conditions d'inclusion de configuration relative doivent venir de "
"fichiers"
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:728
+#: config.c:729
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:732
+#: config.c:733
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:736
+#: config.c:737
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: config.c:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr "hors plage"
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:879
+#: config.c:880
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
"%s : %s"
-#: config.c:882
+#: config.c:883
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
"%s : %s"
-#: config.c:885
+#: config.c:886
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
"standard : %s"
-#: config.c:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
"sous-module %s : %s"
-#: config.c:891
+#: config.c:892
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
"commande %s : %s"
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: config.c:989
+#: config.c:990
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
"défaut"
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
"100"
-#: config.c:2122
+#: config.c:2167
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:2124
+#: config.c:2169
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
"Veuillez vérifier que vous avez les droits d'accès\n"
"et que le dépôt existe."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
+"'zebra', 'dimmed_zebra', 'plain'"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3427
+#: diff.c:4189
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3694
+#: diff.c:4459
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"détection de renommage inexact annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:4719
+#: diff.c:5508
msgid "only found copies from modified paths due to too many files."
msgstr ""
"recherche uniquement des copies par modification de chemin à cause d'un trop "
"grand nombre de fichiers."
-#: diff.c:4722
+#: diff.c:5511
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
-#: dir.c:1948
+#: dir.c:1983
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2067
+#: dir.c:2102
msgid "Untracked cache is disabled on this system or location."
msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Filtrage du contenu"
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : list courte attendue"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "erreur distante : %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr "fait"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr "Le serveur supporte multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr "Le serveur support no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr "Le serveur supporte multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr "Le serveur supporte side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr "Le serveru supporte side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Le serveur supporte allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr "Le serveur support ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
#: help.c:363
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Continuons en supposant que vous avez voulu dire '%s'<"
+msgstr "Continuons en supposant que vous avez voulu dire '%s'."
#: help.c:368
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'<"
+"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
#: help.c:376
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"un processus git peut avoir planté :\n"
"supprimez le fichier manuellement pour poursuivre."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Impossible de créer '%s.lock' : %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "échec de addinfo_cache pour le chemin '%s'"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre."
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
">'%s' dans %s"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Renommage de %s en %s et de %s en %s à la place"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:575
+#: pathspec.c:571
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
"correspondre à tous le chemins"
-#: pathspec.c:599
+#: pathspec.c:595
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "impossible de supprimer la référence %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossible de supprimer la référence %s"
-
# à priori on parle d'une branche ici
#: ref-filter.c:35 wt-status.c:1811
msgid "gone"
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) n'accepte pas d'argument"
-#: ref-filter.c:181
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) n'accepte pas d'argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valeur positive attendue objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argument %%(objectname) non reconnu : %s"
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) non reconnu : %s"
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-#: ref-filter.c:570
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-#: ref-filter.c:600
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-#: ref-filter.c:602
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:615
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(aucune branche)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "echec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: remote.c:747
+#: remote.c:750
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-#: remote.c:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1698
+#: remote.c:1699
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1713
+#: remote.c:1714
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
"branche locale de suivi"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
#: remote.c:2087
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: revision.c:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revert"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Action inconnue : %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
msgstr "échec lors de la finalisation de '%s'."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr "impossible de résoudre le commit HEAD\n"
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr "impossible de mettre à jour l'arbre de cache\n"
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr "impossible d'analyser le commit %s\n"
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "impossible d'analyser le commit parent %s\n"
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:973
+#: sequencer.c:975
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"une branche principale a été spécifiée mais le commit %s n'est pas une "
"fusion."
-#: sequencer.c:991
+#: sequencer.c:993
#, c-format
msgid "cannot get commit message for %s"
msgstr "impossible d'obtenir un message de validation pour %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:1179
+#: sequencer.c:1181
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:1186
+#: sequencer.c:1188
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:1359
+#: sequencer.c:1361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:1361
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:1647
+#: sequencer.c:1666
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:1658
+#: sequencer.c:1677
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
"git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1885
msgid "and made changes to the index and/or the working tree\n"
msgstr "et a mis à jour l'index ou l'arbre de travail\n"
-#: sequencer.c:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1948
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:2218
+#: sequencer.c:2241
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: sequencer.c:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script : options non gérées"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script : erreur lors de la préparation des révisions"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "liste à faire inutilisable : '%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Attention : certains commits ont pu être accidentellement supprimés.\n"
+"Commits supprimés (du plus jeune au plus vieux) :\n"
+
+#: sequencer.c:2648
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
+"\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
+"Les comportements disponibles sont : ignore, warn, error.\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
+"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "impossible d'analyser le commit '%s'"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "impossible de tronquer '%s'"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "le script a déjà été réarrangé."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "impossible de finir '%s'"
+
#: setup.c:171
#, c-format
msgid ""
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
msgstr "Impossible de modifié en '%s'"
-#: setup.c:1081
+#: setup.c:1077
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas activé)."
-#: setup.c:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: sha1_file.c:586
+#: sha1_file.c:554
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: sha1_file.c:592
+#: sha1_file.c:560
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "le SHA1 court %s est ambigu"
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr "Les candidats sont :"
-#: sha1_name.c:589
+#: sha1_name.c:590
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"
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
-#: submodule.c:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
# ici %s est un chemin
-#: submodule.c:115
+#: submodule.c:138
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:309
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dans le sous-module '%s' non populé"
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Échec de résolution de HEAD comme référence valide."
+
+#: submodule.c:1304
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' n'est pas reconnu comme dépôt git"
-#: submodule.c:1475
+#: submodule.c:1442
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
-#: submodule.c:1488
+#: submodule.c:1455
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "échec de la commande trailer '%s'"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "symbole vide dans la ligne de fin '%.*s'"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "%s n'est pas un fichier régulier"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "impossible de renommer un fichier temporaire en %s"
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"Les chemins suivant de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr "Abandon."
msgid "empty filename in tree entry"
msgstr "nom de fichier vide dans une entrée de l'arbre"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"contenus :\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:145
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
"pas à jour :\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"jour par l'extraction creuse :\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"à jour par extraction creuse :\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
"Mise à jour impossible pour le sous-module :\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-"stratégie de mise à jour de sous-module non supportée pour le sous-module "
-"'%s'"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr "Extraction des fichiers"
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossible d'ouvrir '%s' en écriture"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
msgid "could not close %s"
msgstr "impossible de fermer %s"
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
"validé)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
"dans la copie de travail)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:821
+#: wt-status.c:819
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Votre remisage contient actuellement %d entrée"
msgstr[1] "Votre remisage contient actuellement %d entrées"
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"Ne touchez pas à la ligne ci-dessus\n"
+"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
#: wt-status.c:1780
msgid "No commits yet on "
-msgstr "Encore aucun commit sur "
+msgstr "Encore aucun commit sur "
#: wt-status.c:1784
msgid "HEAD (no branch)"
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:249
+#: builtin/add.c:251
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:281
+#: builtin/add.c:283
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:284
+#: builtin/add.c:286
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:285
+#: builtin/add.c:287
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:288
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:331
+#: builtin/add.c:333
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:349
+#: builtin/add.c:351
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
-#: builtin/add.c:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:401
+#: builtin/add.c:403
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:405
+#: builtin/add.c:407
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:842
+#: builtin/am.c:851
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1172
+#: builtin/am.c:1194
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1173
+#: builtin/am.c:1195
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1304
+#: builtin/am.c:1302
msgid "Patch is empty."
msgstr "Le patch actuel est vide."
-#: builtin/am.c:1370
+#: builtin/am.c:1368
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1584
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1588
+#: builtin/am.c:1586
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1613
+#: builtin/am.c:1611
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1913
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1922
+#: builtin/am.c:1920
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2227
+#: builtin/am.c:2226
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2240
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2276
+#: builtin/am.c:2275
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2287
+#: builtin/am.c:2286
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
#: builtin/blame.c:682
msgid "Show author email instead of name (Default: off)"
-msgstr "Afficher l'courriel de l'auteur au lieu du nom (Défaut : désactivé)"
+msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
#: builtin/blame.c:683
msgid "Ignore whitespace differences"
#: builtin/blame.c:928
msgid "Blaming lines"
-msgstr "Assignation de blâme au lignes"
+msgstr "Assignation de blâme aux lignes"
#: builtin/branch.c:27
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<options>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<options>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"La branche '%s' n'est pas totalement fusionnée.\n"
"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "impossible d'analyser la chaîne de format"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "impossible de copier la branche actuelle, il n'y en a pas."
+
+#: builtin/branch.c:472
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Échec de copie de la branche"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Copie d'une branche mal nommée '%s'"
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "Renommage d'un branche mal nommée '%s'"
+msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:506
+#: builtin/branch.c:528
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"La branche est copiée, mais la mise à jour du fichier de configuration a "
+"échoué"
+
+#: builtin/branch.c:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "modifier l'information amont"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "ne pas utiliser"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
msgstr "Désactiver l'information amont"
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:579
+#: builtin/branch.c:603
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copier une branche et son reflog"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copier une branche, même si la cible existe"
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "clé"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "objet"
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Échec de résolution de HEAD comme référence valide."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:686
+#: builtin/branch.c:713
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "trop de branches pour une opération de renommage"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "trop de branches pour spécifier une branche amont"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "trop d'arguments pour spécifier une branche amont"
+
+#: builtin/branch.c:756
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "trop de branches pour désactiver un amont"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:743
+#: builtin/branch.c:779
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:749
+#: builtin/branch.c:785
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:763
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr "créer manuellement 'HEAD' n'a pas de sens"
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
-#: builtin/branch.c:772
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
-"track ou --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"\n"
-"Si vous vouliez que '%s' suive '%s', faites ceci :\n"
-"\n"
+"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
+"upstream-to' à la place."
#: builtin/bundle.c:45
#, c-format
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr "chaîne"
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-"'%s' n'est pas un commit et une branche '%s' ne peut pas être créée depuis."
+"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:828
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:938
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:941
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "spécificateur de chemin"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
#: builtin/pull.c:205
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
#: parse-options.h:142
msgid "time"
msgstr "heure"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-"ne pas cloner les tags et indiquer au récupérations futures de ne pas le "
+"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
"faire"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:720
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
"\"."
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
"\"file://\"."
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr "version"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr "date"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "message"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation dû à un message de validation vide.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
+
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "--local can only be used inside a git repository"
msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"impossible de surcharger des valeurs multiples avec une seule valeur\n"
" Utilisez une regexp, --add ou --replace-all pour modifier %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
msgid "annotated"
msgstr "annoté"
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr "recherche de la description de %s\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken est incompatible avec les commits ou assimilés"
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "échec : %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "impossible de lire le fichier symlink %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "Impossible de lire l'objet %s pour le symlink %s"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr "<outil>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
"non-nul"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "<command>"
msgstr "<commande>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
"dépôt distant"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr "répertoire"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
msgid "populate log with at most <n> entries from shortlog"
msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr "fichier d'où lire"
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respecter les couleurs de formatage"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "afficher seulement les références pointant sur l'objet"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "afficher seulement les références qui sont fusionnées"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "afficher seulement les références qui ne sont pas fusionnées"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "afficher seulement les références qui ne contiennent pas le commit"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "impossible de faire un stat de %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "impossible de lire la valeur de gc.logexpiry %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:999
+#: builtin/grep.c:781
msgid "search in index instead of in the work tree"
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nom de base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "préfixer le nom de base du projet parent à la sortie"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
msgid "show filename only once above matches from same file"
msgstr ""
"afficher le nom de fichier une fois au dessus des correspondances du même "
"fichier"
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
msgid "show a line with the function name before matches"
msgstr ""
"afficher une ligne avec le nom de la fonction avant les correspondances"
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr "option non supportée avec --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s\" est un alias de `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossible de lire l'information existante de l'objet %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "éditer les fichiers sur place"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "éliminer les lignes de fin vides"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "où placer les nouvelles lignes terminales"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "action si les lignes terminales existent déjà"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "action si les lignes terminales manquent"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "éliminer les lignes terminales vides"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "ne pas appliquer les règles de la configuration"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "joindre les valeurs continuées avec des caractères blancs"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "paramètres d'analyse"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "ligne(s) de fin à ajouter"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer n'a aucune signification avec --only-input"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format courriel"
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1284
+#: builtin/log.c:1288
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement."
-#: builtin/log.c:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1315
+#: builtin/log.c:1319
msgid "base commit should be the ancestor of revision list"
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
-#: builtin/log.c:1319
+#: builtin/log.c:1323
msgid "base commit shouldn't be in revision list"
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
-#: builtin/log.c:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1425
+#: builtin/log.c:1431
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1436
+#: builtin/log.c:1442
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1446
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1460
+#: builtin/log.c:1466
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1462
+#: builtin/log.c:1468
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
-msgstr "ajouter l'en-tête d'courriel"
+msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1472
+#: builtin/log.c:1478
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1475
+#: builtin/log.c:1481
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1489
+#: builtin/log.c:1495
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr ""
+"afficher la barre de progression durant la phase de génération des patchs"
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Génération des patchs"
+
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr "afficher les données de débogage"
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
#: builtin/revert.c:109
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "vérifier le crochet commit-msg"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:666
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:893
+#: builtin/merge.c:914
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:898
+#: builtin/merge.c:919
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Possible de fusionner exactement une seule validation dans une tête vide"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "Directory %s is in index and no submodule?"
msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "impossible de résoudre '%s' comme une référence valide."
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
"avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
"cause de pack.packSizeLimit"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
"compressés"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
msgid "write the pack index file in the specified idx format version"
msgstr ""
"écrire le fichier d'index du paquet dans le format d'index de version "
"spécifié"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
"deltas"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
"objets"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
msgid "write a bitmap index together with the pack index"
msgstr "écrire un index en bitmap associé à l'index de paquet"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr "Décompte des objets"
msgid "prune loose refs (default)"
msgstr "éliminer les références perdues (défaut)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Suppression des objets dupliqués"
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:403
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
"venez de récupérer."
-#: builtin/pull.c:401
+#: builtin/pull.c:405
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
"vous venez de récupérer."
-#: builtin/pull.c:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Généralement, cela signifie que vous avez indiqué un spécificateur\n"
"de référence joker qui n'a pas eu de correspondance sur le serveur distant."
-#: builtin/pull.c:405
+#: builtin/pull.c:409
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:438 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:852
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
msgid "git rebase--helper [<options>]"
msgstr "git rebase-helper [<options>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "garder les validations vides"
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr "continuer le rebasage"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr "abandonner le rebasage"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "créer les script de rebasage"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "raccourcir les SHA-1 dans la liste à-faire"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "étendre les SHA-1 dans la liste à-faire"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "vérifier la liste à-faire"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "éviter les commandes de picorage non nécessaires"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "réarranger les lignes fixup/squash"
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(pas d'URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (état non demandé)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branche locale configurée pour 'git pull' :"
msgstr[1] " Branches locales configurées pour 'git pull' :"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " Les références locales seront reflétées par 'git push'"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Référence locale configurée pour 'git push'%s :"
msgstr[1] " Références locales configurées pour 'git push'%s :"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
msgstr "échec de la suppression de '%s'"
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr ""
"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
"tard"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Échec de résolution de '%s' comme une révision valide."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Échec de résolution de '%s' comme un arbre valide."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un état zéro même si rien ne correspondait"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Grouper par validateur plutôt que par auteur"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "trier la sortie sur le nombre de validations par auteur"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Supprimer les descriptions de validation, fournit seulement le nombre de "
"validations"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Afficher l'adresse courriel de chaque auteur"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Couper les lignes"
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
"son propre amont d'autorité."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"la branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<chemin>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nom>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"supprimer le message d'erreur pour une référence non symbolique (détachée)"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "supprimer la référence symbolique"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "raison de la mise à jour"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nométiquette>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "l'option --points-at est autorisée seulement en mode liste"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
msgid "test if the filesystem supports untracked cache"
msgstr "tester si le système de fichier supporte le cache de non-suivis"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "enable untracked cache without testing the filesystem"
msgstr "activer le cache de non-suivis sans tester le système de fichier"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer l'index coupé"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver l'index coupé"
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver le cache des fichiers non-suivis"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer le cache des fichiers non-suivis"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
+"attendus, %<PRIuMAX> octets lus)"
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
"inexistant"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "afficher les arbres de travail éliminés"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "Sortir immédiatement après l'annonce initiale des références"
-#: upload-pack.c:1045
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
"Git"
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfert après <n> secondes d'inactivité"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\n"
" chmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
-#: http.c:358
+#: http.c:359
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
-#: http.c:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Déjà à jour avec $pretty_name"
#: git-merge-octopus.sh:89
#: git-rebase.sh:58
msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"Lorsque vous aurez résolu ce problème, lancez \"git rebase --continue\".\n"
-"Si vous préférez sauter ce patch, lancez \"git rebase --skip\" à la place.\n"
-"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
-"rebase --abort\"."
+"Résolvez tous les conflits manuellement, marquez-les comme résolus avec\n"
+"\"git add/rm <fichier en conflit>\", puis lancez \"git rebase --continue\".\n"
+"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour "
+"arrêter\n"
+"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"chose\n"
"d'important ici."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
+"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
+"dessus..."
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
-#: git-stash.sh:281
+#: git-stash.sh:288
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
-#: git-stash.sh:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:487
+#: git-stash.sh:495
msgid "No stash entries found."
msgstr "Aucune entrée de remisage trouvée."
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:560
+#: git-stash.sh:568
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:579
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
msgstr ""
"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:633
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
msgstr ""
"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
"$sha1. La récupération directe de ce commit a échoué."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Commandes :\n"
-" p, pick = picorer le commit\n"
-" r, reword = picorer le commit, mais reformuler son message\n"
-" e, edit = picorer le commit, mais s'arrêter pour le modifier\n"
-" s, squash = prendre le commit, mais le fusionner avec le précédent\n"
+" p, pick = utiliser le commit\n"
+" r, reword = utiliser le commit, mais reformuler son message\n"
+" e, edit = utiliser le commit, mais s'arrêter pour le modifier\n"
+" s, squash = utiliser le commit, mais le fusionner avec le précédent\n"
" f, fixup = comme \"squash\", mais en éliminant son message\n"
" x, exec = lancer la commande (reste de la ligne) dans un shell\n"
" d, drop = supprimer le commit\n"
msgid "Refusing to squash a merge: $sha1"
msgstr "Refus d'écraser un commit de fusion: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Erreur lors de la réapplication de la fusion $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "Impossible de picorer $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Ceci est le ${n}ième message de validation :"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Le message de validation ${n} sera ignoré :"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Ceci est la combinaison de $count commit."
msgstr[1] "Ceci est la combinaison de $count commits."
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Impossible d'écrire $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Ceci est la combinaison de 2 commits."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Impossible d'appliquer $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"le\n"
"problème avant de pouvoir reformuler le message du commit."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Arrêté à $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "'$squash_style' impossible avec le commit précédent"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Exécution : $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'exécution a échoué : $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "et a mis à jour l'index ou la copie de travail"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
"git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Commande inconnue : $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Rebasage et mise à jour de $head_name avec succès."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Impossible d'éviter les commandes de picorage non nécessaires"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Attention : certains commits ont pu être accidentellement supprimés.\n"
-"Commits supprimés (du plus jeune au plus vieux) :"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
-"commit.\n"
-"\n"
-"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
-"d'avertissements.\n"
-"Les comportements disponibles sont : ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. "
-"Ignoré."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
-"rebase --continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'éditeur est sorti en erreur, abandon total"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' contient une version intermédiaire du courriel que vous composiez.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contient le courriel composé.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases est incompatible avec d'autres options\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paramètre de --confirm inconnu : '%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "attention : `:include:` n'est pas supporté : %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "attention : ligne sendmail non reconnue : %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
" * en fournissant l'option --format-patch pour une plage.\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Échec à l'ouverture du répertoire %s : %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal : %s : %s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"Aucun fichier patch spécifié !\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Ligne de sujet non trouvée dans %s ?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Impossible d'ouvrir %s en écriture : %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Échec à l'ouverture de %s.final : %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Échec à l'ouverture de %s : %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
"Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
"vraiment envoyer.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal : l'alias '%s' se développe en lui-même\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
"a) ? "
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "le chemin vers la CA \"%s\" n'existe pas"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
msgstr "Une réponse est nécessaire"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "echec de STARTTLS ! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
"debug."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr "échec de l'envoi de %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Envoi simulé de %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr "%s envoyé\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr "Simulation OK. Le journal indique :\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr "OK. Le journal indique :\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr "Résultat : "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) n'accepte pas d'argument"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "stratégie de mise à jour de sous-module non supportée pour le sous-module "
+#~ "'%s'"
+
+#~ msgid "change upstream info"
+#~ msgstr "modifier l'information amont"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Si vous vouliez que '%s' suive '%s', faites ceci :\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "nom de base"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "préfixer le nom de base du projet parent à la sortie"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne "
+#~ "suivante :\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr ""
+#~ "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
+
#~ msgid "Could not open file '%s'"
#~ msgstr "impossible d'ouvrir le fichier '%s'"
#~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
#~ "amont"
-#~ msgid "unable to parse format"
-#~ msgstr "impossible d'analyser le format"
-
#~ msgid "improper format entered align:%s"
#~ msgstr "format non convenable align:%s"
#~ msgid "no files added"
#~ msgstr "aucun fichier ajouté"
-#~ msgid "force creation (when already exists)"
-#~ msgstr "forcer la création (même si la cible existe)"
-
#~ msgid "slot"
#~ msgstr "emplacement"
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-01 12:26+0900\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-17 16:23+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
"ko>\n"
msgid "Exiting because of an unresolved conflict."
msgstr "해결하지 못한 충돌 때문에 끝납니다."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "병합 작업을 다 마치지 않았습니다 (MERGE_HEAD 파일이 있습니다)."
msgid "unrecognized whitespace ignore option '%s'"
msgstr "알 수 없는 공백 무시 옵션 '%s'"
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject 및 --3way 옵션은 같이 쓸 수 없습니다."
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached 및 --3way 옵션은 같이 쓸 수 없습니다."
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr "저장소 밖에서 --3way 옵션 사용"
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr "저장소 밖에서 --index 옵션 사용"
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr "저장소 밖에서 --cached 옵션 사용"
-#: apply.c:836
+#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "타임스탬프 정규식을 준비할 수 없습니다 (%s)"
-#: apply.c:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다"
-#: apply.c:967
+#: apply.c:966
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: 잘못된 git-diff - %2$d번 줄에서 /dev/null을 기대했지만, '%1$s'이"
"(가) 왔습니다"
-#: apply.c:973
+#: apply.c:972
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: 잘못된 git-diff - %d번 줄에 새 파일 이름이 올바르지 않습니다"
-#: apply.c:974
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: 잘못된 git-diff - %d번 줄에 예전 파일 이름이 올바르지 않습니다"
-#: apply.c:979
+#: apply.c:978
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: 잘못된 git-diff - %d번 줄에서 /dev/null을 기대했습니다"
-#: apply.c:1008
+#: apply.c:1007
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "%d번 줄에 잘못된 모드: %s"
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "일관성 없는 헤더 줄 %d번 및 %d번"
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: 예상치 못한 줄: %.*s"
-#: apply.c:1567
+#: apply.c:1566
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s"
-#: apply.c:1587
+#: apply.c:1586
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니"
"다. (%d번 줄)"
-#: apply.c:1600
+#: apply.c:1599
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 헤더에 파일 이름 정보가 없습니다 (%d번 줄)"
-#: apply.c:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr "새 파일이 예전 내용에 의존합니다"
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr "삭제한 파일에 아직 내용이 들어 있습니다"
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr "패치가 %d번 줄에서 망가졌습니다"
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr "새 파일 %s이(가) 예전 내용에 의존합니다"
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다"
-#: apply.c:1848
+#: apply.c:1865
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다"
-#: apply.c:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s"
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다"
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr "%d번 줄에 쓰레기 데이터만 있는 패치"
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr "%s을(를) 열거나 읽을 수 없습니다"
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr "줄 시작이 잘못됨: '%c'"
-#: apply.c:3052
+#: apply.c:3077
#, 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번 줄)"
-#: apply.c:3064
+#: apply.c:3089
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)"
-#: apply.c:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
"다음을 검색하던 중:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
-#: apply.c:3100
+#: apply.c:3125
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
-#: apply.c:3146
+#: apply.c:3171
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
-#: apply.c:3156
+#: apply.c:3181
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "패치가 '%s'(%s)에 적용되지만, 현재 내용과 일치하지 않습니다."
-#: apply.c:3164
+#: apply.c:3189
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "패치는 빈 '%s'에 적용되지만, 현재 비어 있지 않습니다"
-#: apply.c:3182
+#: apply.c:3207
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "'%2$s'에 대한 필요한 %1$s 포스트이미지를 읽을 수 없습니다"
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다"
-#: apply.c:3201
+#: apply.c:3226
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실"
"제 %s)"
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr "패치 실패: %s:%ld"
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr "%s을(를) 가져올 수 없습니다"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "%s을(를) 읽는데 실패했습니다"
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: 인덱스에 없습니다"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr "%s: 인덱스와 맞지 않습니다"
-#: apply.c:3556
+#: apply.c:3582
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
-#: apply.c:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "3-방향 병합으로 대신합니다...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "'%s'의 현재 내용을 읽을 수 없습니다"
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "3-방향 병합으로 대신하는데 실패했습니다...\n"
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "패치를 '%s'에 충돌이 있는 상태로 적용.\n"
-#: apply.c:3610
+#: apply.c:3636
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "패치를 '%s'에 패치 문제 없이 적용.\n"
-#: apply.c:3636
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr "제거하는 패치 다음에 파일 내용이 남았습니다"
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr "%s: 잘못된 종류"
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
msgstr "잘못된 경로 '%s'"
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr "%s: 이미 인덱스에 있습니다"
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: 이미 작업 디렉터리에 있습니다"
-#: apply.c:3941
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
-#: apply.c:3946
+#: apply.c:3972
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s의 새 모드(%1$o)가 %4$s의 예전 모드(%3$o)와 다릅니다"
-#: apply.c:3966
+#: apply.c:3992
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다"
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: 패치를 적용하지 않습니다"
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr "%s 패치를 확인하는 중입니다..."
-#: apply.c:4076
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1 정보가 없거나 %s 하위 모듈에서 쓸 수 없습니다"
-#: apply.c:4083
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s에 대한 모드 변경이지만, 현재 HEAD에 없습니다"
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 정보가 없거나 쓸 수 없습니다 (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "경로 '%s'에 대해 make_cache_entry 실패"
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "임시 인덱스에 %s 항목을 추가할 수 없습니다"
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "임시 인덱스를 %s에 쓸 수 없습니다"
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "인덱스에서 %s을(를) 제거할 수 없습니다"
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "하위 모듈 %s에 대해 손상된 패치"
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다"
-#: apply.c:4292
+#: apply.c:4318
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "새로 만든 파일 '%s'에 대해 예비 저장소를 만들 수 없습니다"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다"
-#: apply.c:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
msgstr "'%s'에 쓰는데 실패했습니다"
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
msgstr "'%s' 파일을 닫는 중입니다"
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)"
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s 패치 깔끔하게 적용."
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr "내부 오류"
-#: apply.c:4522
+#: apply.c:4548
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s 패치를 (%d개 거부) 적용..."
-#: apply.c:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr "%s을(를) 열 수 없습니다"
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "패치 부위 #%d 깔끔하게 적용."
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr "패치 부위 #%d 거부됨."
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
msgstr "패치 '%s' 건너뜀."
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr "인식할 수 없는 입력"
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr "인덱스 파일을 읽을 수 없습니다"
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "'%s' 패치를 열 수 없습니다: %s"
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "공백 오류 %d개를 넘어갑니다"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d번 줄에서 공백 오류를 추가합니다."
-#: apply.c:4874
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "공백 오류를 바로잡은 뒤에 %d번 줄 적용."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "새 인덱스 파일에 쓸 수 없습니다"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr "경로"
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr "주어진 경로에 해당하는 변경 사항을 적용하지 않습니다"
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr "주어진 경로에 해당하는 변경 사항을 적용합니다"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr "개수"
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "전통적인 diff 경로 앞의 <개수>개의 앞 슬래시(/)를 제거합니다"
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr "패치에서 추가하는 파일을 무시합니다"
-#: apply.c:4933
+#: apply.c:4959
msgid "instead of applying the patch, output diffstat for the input"
msgstr "패치를 적용하는 대신, 입력에 대한 diffstat을 출력합니다"
-#: apply.c:4937
+#: apply.c:4963
msgid "show number of added and deleted lines in decimal notation"
msgstr "십진수로 추가 및 삭제한 줄 수를 표시합니다"
-#: apply.c:4939
+#: apply.c:4965
msgid "instead of applying the patch, output a summary for the input"
msgstr "패치를 적용하는 대신, 입력에 대한 요약을 출력합니다"
-#: apply.c:4941
+#: apply.c:4967
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "패치를 적용하는 대신, 패치를 적용 가능한지 확인합니다"
-#: apply.c:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr "현재 인덱스에서 패치가 적용 가능한지 확인합니다"
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr "작업 폴더를 바꾸지 않고 패치를 적용합니다"
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr "작업 영역 밖의 파일을 바꾸는 패치를 허용합니다"
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "그리고 패치도 적용합니다 (--stat/--summary/--check 옵션과 같이 사용)"
-#: apply.c:4951
+#: apply.c:4977
msgid "attempt three-way merge if a patch does not apply"
msgstr "패치를 적용하지 않으면 3-방향 병합을 시도합니다"
-#: apply.c:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
msgstr "내장 인덱스 정보를 사용해 임시 인덱스를 만듭니다"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr "경로를 NUL 문자로 구분합니다"
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr "최소한 <n>줄이 컨텍스트와 일치하는지 확인합니다"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr "동작"
-#: apply.c:4960
+#: apply.c:4986
msgid "detect new or modified lines that have whitespace errors"
msgstr "공백 오류가 있는 추가됐거나 수정된 줄을 찾습니다"
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
msgstr "컨텍스트를 찾을 때 공백 변경 사항을 무시합니다"
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr "패치를 반대 순서로 적용합니다"
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr "최소한의 컨텍스트 한 줄도 없이 적용합니다"
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "거부된 패치 부분을 대응되는 *.rej 파일에 남겨둡니다"
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr "패치 부분이 겹쳐도 허용합니다"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "자세히 표시"
-#: apply.c:4978
+#: apply.c:5004
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "파일 끝에 줄바꿈이 빠졌음을 잘못 검색한 경우에 무시합니다"
-#: apply.c:4981
+#: apply.c:5007
msgid "do not trust the line counts in the hunk headers"
msgstr "패치 부분의 헤더의 줄 수를 신용하지 않습니다"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr "최상위"
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr "모든 파일 이름에 <최상위>를 앞에 붙입니다"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <저장소> [--exec <명령>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "'%s' 경로명세가 어떤 파일과도 일치하지 않습니다"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "형식"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "압축 형식"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr "접두어"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "파일"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "아카이브를 이 파일에 씁니다"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "작업 폴더의 .gitattributes를 읽습니다"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "아카이브에 포함된 파일을 표준오류로 표시합니다"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "저장만 하기"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "더 빠르게 압축"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "더 작게 압축"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "지원하는 압축 형식의 목록을 표시합니다"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr "저장소"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "원격 저장소 <저장소>에서 아카이브를 가져옵니다"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "명령"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "원격 git-upload-archive 명령의 경로"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "예상치 못한 옵션 --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "--exec 옵션은 --remote 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "예상치 못한 옵션 --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "알 수 없는 아카이브 형식 '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "'%s' 형식에서는 지원하지 않는 인자: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s은(는) 올바른 속성 이름이 아닙니다"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "Bisecting: a merge base must be tested\n"
msgstr "이등분: 병합 베이스를 시험해야 합니다\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "하나의 %s 리비전이 필요합니다"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "'%s' 파일을 만들 수 없습니다"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' 파일을 읽을 수 없습니다"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "이등분 레퍼런스 읽기에 실패했습니다"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s은(는) %s 및 %s 모두에 해당됩니다\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"시험 가능한 커밋이 없습니다.\n"
"잘못도니 경로 파라미터로 시작하지 않았습니까?\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1001
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr ""
"--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "리비전 walk 준비가 실패했습니다"
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었"
-"습니다."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베이스를 통해 리모트의 '%s' 브랜치를 ('%s'에서) 따라가도록 설정되었습니다."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "%s 브랜치가 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "'%s' 브랜치가 리모트의 '%s' 브랜치를 ('%s'에서) 따라가도록 설정되었습니다."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베이스를 통해 리모트의 '%s' 브랜치를 따라가도록 설정되었습니다."
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "%s 브랜치가 %s 브랜치를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "'%s' 브랜치가 '%s' 브랜치를 따라가도록 설정되었습니다."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베이스를 통해 리모트의 '%s' 레퍼런스를 따라가도록 설정되었습니다."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "%s 브랜치가 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "'%s' 브랜치가 리모트의 '%s' 레퍼런스를 따라가도록 설정되었습니다."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베이스를 통해 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베이스를 통해 로컬의 '%s' 레퍼런스를 따라가도록 설정되었습니다."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "%s 브랜치가 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "'%s' 브랜치가 로컬의 '%s' 레퍼런스를 따라가도록 설정되었습니다."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgid "A branch named '%s' already exists."
msgstr "이름이 '%s'인 브랜치가 이미 있습니다."
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr "현재 브랜치를 강제로 업데이트할 수 없습니다."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"따라가기 정보를 설정할 수 없습니다. 시작 위치 '%s'이(가) 브랜치가 아닙니다."
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "요청한 업스트림 '%s' 브랜치가 없습니다"
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"새 로컬 브랜치를 거기에 해당하는 리모트 브랜치로 push하려면,\n"
"\"git push -u\"로 push하는 업스트림을 설정할 수 있습니다."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "올바른 오브젝트 이름이 아닙니다: '%s'."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "애매한 오브젝트 이름: '%s'."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다"
msgid "unrecognized header: %s%s (%d)"
msgstr "인식할 수 없는 헤더: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "'%s'을(를) 열 수 없습니다"
msgid "Repository lacks these prerequisite commits:"
msgstr "저장소에 필수적인 다음 커밋이 없습니다:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "번들에 다음 레퍼런스 %d개가 있습니다:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "번들은 전체 커밋 내역을 기록합니다."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "번들에 다음 레퍼런스 %d개가 필요합니다:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "pack-objects 명령을 실행할 수 없습니다"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "pack-objects 명령이 죽었습니다"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list 명령이 죽었습니다"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "알 수 없는 인자: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "빈 번들은 만들지 않습니다."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "'%s'을(를) 만들 수 없습니다"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "index-pack 명령이 죽었습니다"
msgid "invalid color value: %.*s"
msgstr "잘못된 색 값: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr "parse %s을(를) 파싱할 수 없습니다"
msgid "%s %s is not a commit!"
msgstr "%s %s, 커밋이 아닙니다"
-#: commit.c:1511
+#: commit.c:1517
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "memory exhausted"
msgstr "메모리 바닥남"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr "상대 경로 설정 include 조건은 파일에서 와야 합니다"
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr "블롭 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr "파일 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#: config.c:728
+#: config.c:729
#, c-format
msgid "bad config line %d in standard input"
msgstr "표준 입력 안에 %d번 줄에 잘못된 설정"
-#: config.c:732
+#: config.c:733
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "하위 모듈 블롭 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#: config.c:736
+#: config.c:737
#, c-format
msgid "bad config line %d in command line %s"
msgstr "명령행 %2$s 안에 %1$d번 줄에 잘못된 설정"
-#: config.c:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr "%2$s 안에 %1$d번 줄에 잘못된 설정"
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr "범위를 벗어남"
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr "단위가 잘못됨"
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): %s"
-#: config.c:879
+#: config.c:880
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): %s"
-#: config.c:882
+#: config.c:883
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): %s"
-#: config.c:885
+#: config.c:886
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): %s"
-#: config.c:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): %s"
-#: config.c:891
+#: config.c:892
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): %s"
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): %s"
-#: config.c:989
+#: config.c:990
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'"
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다"
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s"
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr "잘못 묶음 압축 단계 %d"
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr "명령행 설정을 파싱할 수 없습니다"
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다"
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
msgstr "잘못된 %s: '%s'"
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "알 수 없는 core.untrackedCache 값 '%s'; 기본값으로 'keep' 사용"
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 값('%d')은 0에서 100 사이여야 합니다"
-#: config.c:2122
+#: config.c:2167
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "명령행 설정에서 '%s'을(를) 설정할 수 없습니다"
-#: config.c:2124
+#: config.c:2169
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니다"
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr "%s은(는) 여러 개 값이 있습니다"
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr "%s에 대해 fstat 실패"
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' 설정을 지울 수 없습니다"
"올바른 접근 권한이 있는지, 그리고 저장소가 있는지\n"
"확인하십시오."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "연결을 확인하는 중입니다"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list'를 실행할 수 없습니다"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "rev-list 쓰기에 실패했습니다"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "rev-list의 표준입력을 닫는데 실패했습니다"
msgid "Performing inexact rename detection"
msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "'%s' 옵션에는 값이 필요합니다"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 알 수 없는 dirstat 파라미터 '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr "옮김 색 설정은 'no', 'default', 'zebra', 'dimmed_zebra', 'plain' 중의 하나입니다."
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'"
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"'diff.submodule' 설정 변수에 오류:\n"
"%s'"
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤"
-#: diff.c:3427
+#: diff.c:4189
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
-#: diff.c:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다"
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4459
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'"
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
msgstr "파일이 너무 많아서 부정확한 이름 바꾸기 검색 기능을 건너뜁니다."
-#: diff.c:4719
+#: diff.c:5508
msgid "only found copies from modified paths due to too many files."
msgstr "파일이 너무 많아서 수정한 경로의 복사본만 찾았습니다."
-#: diff.c:4722
+#: diff.c:5511
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령을 다시 시도해 보십시오."
-#: dir.c:1948
+#: dir.c:1983
msgid "failed to get kernel name and information"
msgstr "커널 이름과 정보를 가져오는데 실패했습니다"
-#: dir.c:2067
+#: dir.c:2102
msgid "Untracked cache is disabled on this system or location."
msgstr "이 시스템 또는 위치에서는 추적되지 않는 캐시를 사용하지 않습니다."
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
msgstr "%s에 필요한 디렉터리를 만들 수 없습니다"
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 git 디렉터리를 옮겨올 수 없습니다"
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "내용 필터링"
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' 파일에 stat을 할 수 없습니다"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: 얕은 목록을 예상함"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "리모트 오류: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 옵션은 multi_ack_detailed가 필요합니다"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "shallow 줄이 잘못됨: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "unshallow 줄이 잘못됨: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "오브젝트가 없습니다: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "오브젝트에 오류: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "shallow가 없습니다: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow가 와야 하지만, %s을(를) 받았습니다"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "받음: %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "잘못된 커밋 %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "포기함"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr "완료"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "받음: %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "%s 항목을 완료로 표시"
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr "이미 %s (%s) 있음"
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: 사이드밴드 디멀티플렉서를 fork할 수 없습니다"
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr "프로토콜 오류: 잘못된 묶음 헤더"
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s 명령을 fork할 수 없습니다"
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr "%s 실패"
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr "사이드밴드 디멀티플렉서에 오류"
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr "서버에서 shallow 클라이언트를 지원하지 않습니다"
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr "서버에서 multi_ack_detailed를 지원합니다"
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr "서버에서 no-done을 지원합니다"
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr "서버에서 multi_ack를 지원합니다"
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr "서버에서 side-band-64k를 지원합니다"
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr "서버에서 side-band를 지원합니다"
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr "서버에서 allow-tip-sha1-in-want를 지원합니다"
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "서버에서 allow-reachable-sha1-in-want를 지원합니다"
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr "서버에서 ofs-delta를 지원합니다"
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr "서버 버전이 %.*s입니다"
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "서버에서 --shallow-signed 옵션을 지원하지 않습니다"
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "서버에서 --shallow-exclude 옵션을 지원하지 않습니다"
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr "서버에서 --deepen 옵션을 지원하지 않습니다"
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr "공통 커밋 없음"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: 가져오기 실패."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr "해당하는 리모트 헤드가 없습니다"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr "그런 리모트가 레퍼런스가 없습니다: %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "서버에서 알려지지 않은 %s 오브젝트에 대한 요청을 허용하지 않습니다"
msgid "could not create temporary file"
msgstr "임시 파일을 만들 수 없습니다"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "log.graphColors에 잘못된 색을 ('%.*s') 무시합니다"
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %s을(를) 읽을 수 없습니다"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s'에 대해 stat()이 실패했습니다"
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
msgstr "'%s': 읽다가 잘림"
msgid "name consists only of disallowed characters: %s"
msgstr "이름이 허용하지 않는 문자로만 이루어져 있습니다: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "시각 형식이 잘못되었습니다: %s"
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"저장소에서 깃 프로세스가 전에 이상 종료했을 수도 있습니다:\n"
"수동으로 해당 파일을 제거하고 계속하십시오."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "'%s.lock'을 만들 수 없습니다: %s"
msgid "failed to read the cache"
msgstr "캐시를 읽는데 실패했습니다"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "새 인덱스 파일을 쓸 수 없습니다"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(잘못된 커밋)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "'%s' 경로에 대해 addinfo_cache가 실패했습니다"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "트리 빌드에 오류"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "'%s' 경로 만들기에 실패했습니다%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "하위 디렉터리에 공간을 만드려고 %s을(를) 제거합니다\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": 아마도 D/F 충돌?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "'%s' 위치의 추적되지 않는 파일을 잃기를 거부합니다"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "%s '%s' 오브젝트를 읽을 수 없음"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s'에 대해 블롭을 예상"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "'%s'을(를) 여는데 실패: %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "'%s' 심볼릭 링크에 실패: %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "다음을 어떻게 할지 알 수 없습니다: %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "내부 병합 실행에 실패"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "%s을(를) 데이터베이스에 추가할 수 없습니다"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
msgstr ""
"충돌! (%s/삭제): %s (위치 %s) 및 %s (%s에서) 삭제. %s 버전의 %s 트리에 남음."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"충돌! (%s/삭제): %s (위치 %s) 삭제, %s에서 %s(으)로 (위치 %s). %s 버전의 %s "
"트리에 남음."
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"충돌! (%s/삭제): %s (위치 %s) 및 %s (위치 %s) 삭제. %s 버전의 %s 트리에 "
"%s(으)로 남음."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"충돌! (%s/삭제): %s (위치 %s) 삭제, %s에서 %s(으)로 (위치 %s). %s 버전의 %s "
"트리에 남음 (위치 %s)."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "이름바꾸기"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "이름바꿈"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s은(는) %s에 있는 디렉터리로 %s(으)로 이름을 바꿉니다"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"충돌! (이름바꾸기/이름바꾸기): \"%3$s\" 브랜치에서 이름바꾸기 \"%1$s\"->"
"\"%2$s\" \"%6$s\" 브랜치에서 이름 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (해결되지 않음)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"충돌! (rename/rename): 이름 바꾸기 %s->%s (위치 %s). 이름 바꾸기 %s->%s (위"
"치 %s)"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "대신 이름을 %s에서 %s(으)로 바꾸고 %s에서 %s(으)로 바꿉니다"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "충돌! (rename/add): 이름 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "병합된 %s을(를) 추가합니다"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "대신 %s(으)로 추가합니다"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "%s 오브젝트를 읽을 수 없습니다"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "%s 오브젝트는 블롭이 아닙니다"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "수정"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "수정됨"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "내용"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "추가/추가"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "건너뛰기: %s (기존과 같게 병합)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "자동 병합: %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr "하위 모듈"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "충돌! (%s): %s에 병합 충돌"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "제거: %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "파일/디렉터리"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "디렉터리/파일"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"충돌! (%s): 이름이 %s인 디렉터리가 %s에 있습니다. %s을(를) %s(으)로 추가합니"
"다"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr "추가: %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr "이미 업데이트 상태입니다!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "%s 및 %s 트리의 병합이 실패했습니다"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
msgstr "병합:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "과거의 공통 커밋 %u개 발견:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr "병합 결과에 커밋이 없습니다"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' 오브젝트를 파싱할 수 없습니다"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr "인덱스를 쓸 수 없습니다."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"새로 노트 병합을 시작하기 전에 'git notes merge --commit'\n"
"또는 'git notes merge --abort'로 이전 병합을 커밋/중지하십시오."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "노트 병합 작업을 다 마치지 않았습니다. (%s 있음)"
msgid "Bad %s value: '%s'"
msgstr "잘못된 %s 값: '%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "오브젝트를 파싱할 수 없습니다: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "사용법: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " 또는: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "잘못된 형식의 오브젝트 이름 '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다"
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니다: %s"
-#: pathspec.c:575
+#: pathspec.c:571
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
"경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모"
"든 경로를 지정하려면 점(.)을 사용하십시오."
-#: pathspec.c:599
+#: pathspec.c:595
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "'%s' 경로명세는 심볼릭 링크 아래에 있습니다"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "--pretty 형식을 파싱할 수 없습니다"
"GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n"
"%i 버전을 사용합니다"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
msgstr "'%s'을(를) 닫을 수 없습니다"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
msgstr "'%s'을(를) stat()할 수 없습니다"
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr "git 디렉터리를 열 수 없습니다: %s"
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr "링크 해제할 수 없습니다: %s"
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr "격리된 환경에서 레퍼런스 업데이트가 금지됩니다"
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "%s 레퍼런스를 제거할 수 없습니다"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
msgid "could not delete reference %s: %s"
msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s"
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
msgid "could not delete references: %s"
msgstr "레퍼런스를 삭제할 수 없습니다: %s"
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "%s 레퍼런스를 제거할 수 없습니다"
-
#: ref-filter.c:35 wt-status.c:1811
msgid "gone"
msgstr "없음"
msgid "unrecognized color: %%(color:%s)"
msgstr "인식할 수 없는 색: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "정수 값이 와야 합니다 refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "정수 값이 와야 합니다 refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "인식할 수 없는 %%(%s) 인자: %s"
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body)에 인자를 받지 않습니다"
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject)에 인자를 받지 않습니다"
-#: ref-filter.c:181
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers)에 인자를 받지 않습니다"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "알 수 없는 %%(trailers) 옵션 인자: %s"
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "'contents:lines=%s'에서 0보다 큰 값이 와야 합니다"
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "알 수 없는 %%(contents) 인자: %s"
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "'contents:short=%s'에서 0보다 큰 값이 와야 합니다"
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "알 수 없는 %%(objectname) 인자: %s"
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "예상한 형식: %%(align:<너비>,<위치>)"
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "인식할 수 없는 위치:%s"
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "인식할 수 없는 너비:%s"
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "인식할 수 없는 %%(align) 인자:%s"
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "%%(align) 아톰에 너비가 0보다 커야 합니다"
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "인식할 수 없는 %%(if) 인자: %s"
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "잘못된 형식의 필드 이름: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "알 수 없는 필드 이름: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "형식: %%(if) 아톰이 %%(then) 아톰 없이 사용되었습니다"
-#: ref-filter.c:568
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "형식: %%(then) 아톰이 %%(if) 아톰 없이 사용되었습니다"
-#: ref-filter.c:570
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "형식: %%(then) 아톰이 여러번 사용되었습니다"
-#: ref-filter.c:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "형식: %%(then) 아톰이 %%(else) 뒤에 사용되었습니다"
-#: ref-filter.c:598
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "형식: %%(else) 아톰이 %%(if) 아톰 없이 사용되었습니다"
-#: ref-filter.c:600
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "형식: %%(else) 아톰이 %%(then) 아톰 없이 사용되었습니다"
-#: ref-filter.c:602
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "형식: %%(else) 아톰이 여러번 사용되었습니다"
-#: ref-filter.c:615
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "형식: %%(end) 아톰이 대응되는 아톰 없이 사용되었습니다"
-#: ref-filter.c:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "잘못된 형식의 문자열 %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(브랜치 없음, %s 리베이스)"
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(브랜치 없음, 이등분 %s에서 시작)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD %s 위치에서 분리됨)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD %s(으)로부터 분리됨)"
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(브랜치 없음)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "없는 오브젝트 %s, %s에 대해"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "%s에 parse_object_buffer 실패 (%s에 대해)"
-#: ref-filter.c:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr "'%s'에 잘못된 형식의 오브젝트"
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "망가진 이름 %s에 레퍼런스를 무시합니다"
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "망가진 레퍼런스 %s 무시"
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "형식: %%(end) 아톰이 없습니다"
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "잘못된 형식의 오브젝트 이름 %s"
-#: remote.c:747
+#: remote.c:750
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "%s 및 %s을(를) 모두 %s에 가져올 수 없습니다"
-#: remote.c:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s은(는) 보통 %s을(를) 추적하고, %s을(를) 추적하지 않습니다"
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s은(는) %s 및 %s 모두 추적합니다"
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr "내부 오류"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr "HEAD가 브랜치를 가리키지 않습니다"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
msgstr "그런 브랜치가 없습니다: '%s'"
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' 브랜치에 대해 업스트림을 설정하지 않았습니다"
-#: remote.c:1698
+#: remote.c:1699
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "업스트림 '%s' 브랜치가 리모트 추적 브랜치로 저장되지 않았습니다"
-#: remote.c:1713
+#: remote.c:1714
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "리모트 '%2$s'의 푸시 대상 '%1$s'에 로컬 추적 브랜치가 없습니다"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' 브랜치에 푸시 리모트가 없습니다"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "'%s'에 대한 푸시 레퍼런스명세에 '%s'이(가) 들어 있지 않습니다"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "푸시의 대상이 없습니다 (push.default가 'nothing'입니다)"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "하나의 대상에 대해 'simple' 푸시를 처리할 수 없습니다"
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "브랜치가 '%s'에 맞게 업데이트된 상태입니다.\n"
#: remote.c:2087
msgstr ""
" (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n"
-#: revision.c:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr "현재 브랜치가 망가진 것처럼 보입니다"
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다"
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다"
msgid "the receiving end does not support push options"
msgstr "받는 쪽에서 푸시 옵션을 지원하지 않습니다"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revert"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "알 수 없는 동작: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"이 충돌을 해결한 뒤에, 바로잡은 경로를\n"
"'git add <경로>' 또는 'git rm <경로>'로 표시하십시오"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"'git add <경로>' 또는 'git rm <경로>'로 표시하십시오.\n"
"그리고 결과물을 'git commit'으로 커밋하십시오"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
msgstr "'%s'을(를) 잠글 수 없습니다"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
msgstr "'%s'에 쓸 수 없습니다"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "'%s'에 줄바꿈을 쓸 수 없습니다"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
msgstr "'%s' 마치는데 실패했습니다."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
msgstr "'%s'에서 읽을 수 없습니다"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "변경 사항을 커밋하거나 스태시한 다음 계속하십시오."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: 정방향 진행"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: 새 인덱스 파일을 쓸 수 없습니다"
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr "HEAD 커밋을 처리할 수 없습니다\n"
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr "캐시 트리를 업데이트할 수 없습니다\n"
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr "%s 커밋을 파싱할 수 없습니다\n"
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "%s 이전 커밋을 파싱할 수 없습니다\n"
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr "커밋 %d개가 섞인 결과입니다."
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr "바로잡으려면 HEAD가 필요합니다"
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr "HEAD를 읽을 수 없습니다"
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr "HEAD의 커밋 메시지를 읽을 수 없습니다"
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
msgstr "'%s'을(를) 쓸 수 없습니다"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "1번째 커밋 메시지입니다:"
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr "%s의 커밋 메시지를 읽을 수 없습니다"
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr "커밋 메시지 #%d번입니다:"
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "커밋 메시지 #%d번을 건너뜁니다:"
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr "알 수 없는 명령: %d"
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr "인덱스 파일이 병합되지 않았습니다."
-#: sequencer.c:973
+#: sequencer.c:975
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "%s 커밋은 병합이지만 -m 옵션이 주어지지 않았습니다."
# FIXME: "parent %d" 번호가 무슨 의미?
-#: sequencer.c:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr "%s 커밋에 이전 커밋 %d이(가) 없습니다"
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "메인라인을 지정했지만 %s 커밋이 병합 커밋이 아닙니다."
-#: sequencer.c:991
+#: sequencer.c:993
#, c-format
msgid "cannot get commit message for %s"
msgstr "%s에 대한 커밋 메시지를 가져올 수 없습니다"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: %s 이전 커밋을 파싱할 수 없습니다"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 이름을 바꿀 수 없습니다"
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr "다음을 되돌릴(revert) 수 없습니다: %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr "다음을 적용할(apply) 수 없습니다: %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr "빈 커밋 모음을 건너 뜁니다"
-#: sequencer.c:1179
+#: sequencer.c:1181
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: 인덱스 읽기에 실패했습니다"
-#: sequencer.c:1186
+#: sequencer.c:1188
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: 인덱스 새로 고침에 실패했습니다"
-#: sequencer.c:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr "잘못된 줄 %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "이전 커밋 없이 '%s' 수행할 수 없습니다"
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
msgstr "'%s'에서 읽을 수 없습니다."
-#: sequencer.c:1359
+#: sequencer.c:1361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
-#: sequencer.c:1361
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "사용 불가능 인스트럭션 시트: '%s'"
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr "파싱한 커밋이 없습니다."
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr "되돌리기(revert) 중에 빼오기(cherry-pick)를 할 수 없습니다."
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다."
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr "잘못된 키: %s"
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s의 값이 잘못됨: %s"
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "형식이 잘못된 옵션 시트: '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr "이미 커밋 빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중입니다"
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십시오"
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다"
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr "HEAD를 잠글 수 없습니다"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다"
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr "HEAD를 구해 올 수 없습니다"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
msgid "cannot abort from a branch yet to be born"
msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
msgstr "'%s'을(를) 열 수 없습니다"
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s'을(를) 읽을 수 없습니다: %s"
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr "예상치 못하게 파일이 끝났습니다"
-#: sequencer.c:1647
+#: sequencer.c:1666
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다"
-#: sequencer.c:1658
+#: sequencer.c:1677
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "HEAD를 옮긴 것 같습니다. 되돌리지 않습니다. HEAD를 확인하십시오!"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr "HEAD를 읽을 수 없습니다"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 복사할 수 없습니다"
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr "인덱스를 읽을 수 없습니다"
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1885
msgid "and made changes to the index and/or the working tree\n"
msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다\n"
-#: sequencer.c:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1948
#, c-format
msgid "Applied autostash.\n"
msgstr "자동 스태시 적용.\n"
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr "%s을(를) 저장할 수 없습니다"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"변경 사항은 스태시 안에 안전하게 들어 있습니다.\n"
"언제든지 \"git stash pop\" 또는 \"git stash drop\"을 실행할 수 있습니다.\n"
-#: sequencer.c:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "%s... %.*s 위치에서 멈췄습니다\n"
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr "알 수 없는 명령 %d"
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr "orig-head를 읽을 수 없습니다"
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr "'onto'를 읽을 수 없습니다"
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
msgstr "%s을(를) 업데이트할 수 없습니다"
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr "HEAD를 %s 위치로 업데이트할 수 없습니다"
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr "리베이스할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr "없는 커밋을 수정할 수 없습니다"
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
msgstr "잘못된 키: '%s'"
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
msgstr "잘못된 내용: '%s'"
-#: sequencer.c:2218
+#: sequencer.c:2241
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n"
"커밋하고 'git rebase --continue' 명령을 다시 실행하십시오."
-#: sequencer.c:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
msgstr "스테이징한 변경 사항을 커밋할 수 없습니다."
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s 커밋을 빼올 수 없습니다"
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
msgstr "%s: 잘못된 리비전"
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr "최초의 커밋으로 되돌릴 수 없습니다"
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: 처리하지 않은 옵션"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: 리비전 준비 중 오류"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "사용할 수 없는 할 일 목록: %s"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "'%s'을(를) 쓰기 용으로 열 수 없습니다"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 %s 설정. 무시합니다."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n"
+"버려진 커밋 (최근에서 과거 순서):\n"
+
+#: sequencer.c:2648
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시오.\n"
+"\n"
+"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니다.\n"
+"가능한 동작은: ignore, warn, error\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명령을 실행합니다.\n"
+"또는 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "'%s' 커밋을 파싱할 수 없습니다"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "'%s' 파일을 자를 수 없습니다"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "스크립트를 이미 재구성했습니다"
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "'%s'을(를) 마칠 수 없습니다"
+
#: setup.c:171
#, c-format
msgid ""
"경로와 리비전을 구분하려면 다음과 같이 '--'를 사용하십시오:\n"
"'git <명령> [<리비전>...] -- [<파일>...]'"
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "깃 저장소 버전 <= %d 버전을 기대하지만, %d 버전이 발견되었습니다"
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr "알 수 없는 저장소 확장이 있습니다:"
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "(현재 폴더 또는 상위 폴더가) 깃 저장소가 아닙니다: %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "현재 디렉터리로 돌아올 수 없습니다"
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr "현재 작업 디렉터리를 읽을 수 없습니다"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
msgstr "'%s' 위치로 이동할 수 없습니다"
-#: setup.c:1081
+#: setup.c:1077
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않"
"음)"
-#: setup.c:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"core.sharedRepository 파일모드 값에 (0%.3o) 문제가 있습니다.\n"
"파일의 소유자에 읽기와 쓰기 권한이 있어야 합니다."
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
msgstr "'%s' 경로가 없습니다"
-#: sha1_file.c:586
+#: sha1_file.c:554
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다."
-#: sha1_file.c:592
+#: sha1_file.c:560
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다."
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다"
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "짧은 SHA1 %s은(는) 여럿에 대응됩니다"
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr "후보는 다음과 같습니다:"
-#: sha1_name.c:589
+#: sha1_name.c:590
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"
"확인해 보시고 잘못 만들어진 것이면 지우십시오. 이 메시지를 보고 싶지\n"
"않으면 \"git config advice.objectNameWarning false\" 명령을 사용하십시오."
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"병합하지 않은 .gitmodules를 바꿀 수 없습니다. 병합 충돌을 먼저 해결하십시오"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "경로가 %s일 때 .gitmodules의 섹션을 찾을 수 없습니다"
-#: submodule.c:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ".gitmodules 항목 %s을(를) 업데이트할 수 없습니다"
-#: submodule.c:115
+#: submodule.c:138
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다"
-#: submodule.c:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다"
-
-#: submodule.c:376
+#: submodule.c:309
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "내용이 없는 하위 모듈 '%s'에서"
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다"
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "서브모듈 항목 '%s'(%s)은(는) %s이고, 커밋이 아닙니다"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다."
+
+#: submodule.c:1304
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s'은(는) 깃 저장소로 인식되지 않습니다"
-#: submodule.c:1475
+#: submodule.c:1442
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "하위 모듈 '%s'에서 'git status'를 시작할 수 없습니다"
-#: submodule.c:1488
+#: submodule.c:1455
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "하위 모듈 '%s'에서 'git status'를 실행할 수 없습니다"
-#: submodule.c:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "'%s' 하위 모듈에 변경된 인덱스가 있습니다"
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"여러 개의 작업 폴더가 있는 하위 모듈 '%s'에 대해 relocate_gitdir은 지원하지 "
"않습니다"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "하위 모듈 '%s'의 이름을 찾아볼 수 없습니다"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'에서\n"
"'%s'(으)로\n"
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "재귀적으로 '%s' 하위 모듈에 들어갈 수 없습니다"
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr "'..' 안에서 ls-files를 시작할 수 없습니다"
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr "버그: 리턴된 경로 문자열이 현재 디렉터리와 맞지 않습니다?"
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree가 예상치 못한 코드 %d번을 리턴했습니다"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 값에 음수를 쓸 수 없습니다"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "%s의 값이 올바르지 않습니다"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "트레일러 명령 '%s' 실행 실패"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "알 수 없는 값 '%s', 키 '%s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "%s이(가) 여러개입니다"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "트레일러 '%.*s'에서 빈 트레일러 토큰"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "'%s' 입력 파일을 읽을 수 없습니다"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "표준 입력에서 읽을 수 없습니다"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "%s에 대해 stat()할 수 없습니다"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "'%s' 파일이 일반 파일이 아닙니다"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "사용자가 %s 파일에 쓸 수 없습니다"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "임시 파일을 열 수 없습니다: %s"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다"
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "'%1$s'의 업스트림을 '%3$s'의 '%2$s'(으)로 설정합니다\n"
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: 잘못된 깊이 옵션: %s"
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"다음 하위 모듈 경로에 리모트 어디에도 없는\n"
"변경 사항이 있습니다:\n"
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
"명령을 시도해 보십시오\n"
"\n"
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr "중지함."
msgid "empty filename in tree entry"
msgstr "트리 엔트리에 빈 파일 이름"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "너무 짧은 트리 파일"
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n"
"%%s브랜치를 전환하기 전에 변경 사항을 커밋하거나 스태시하십시오."
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다:\n"
"%%s병합하기 전에 변경 사항을 커밋하거나 스태시하십시오."
-#: unpack-trees.c:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다."
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n"
"%%s%s 전에 변경 사항을 커밋하거나 스태시하십시오."
-#: unpack-trees.c:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"다음 디렉터리를 업데이트하면 그 안의 추적하지 않는 파일을 잃어버립니다:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n"
"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"병합 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n"
"%%s병합하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n"
"%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:145
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"병합 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
"%%s병합하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
"%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "'%s' 항목이 '%s'와(과) 겹칩니다. 묶을 수 없습니다."
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않"
-"았습니다:\n"
+"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않았습니다:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"다:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"다:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
"하위 모듈을 업데이트할 수 없습니다:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr "중지함\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "하위 모듈 업데이트 전략이 '%s' 하위 모듈에서 지원하지 않습니다"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr "파일을 가져옵니다"
msgid "could not open '%s' for reading and writing"
msgstr "읽기와 쓰기용으로 '%s'을(를) 열 수 없습니다"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s'을(를) 읽기용으로 열 수 없습니다"
msgid "could not close %s"
msgstr "%s을(를) 닫을 수 없습니다"
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "병합하지 않은 경로:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (스테이지 해제하려면 \"git reset %s <파일>...\"을 사용하십시오)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (스테이지 해제하려면 \"git rm --cached <파일>...\"을 사용하십시오)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git add <파일>...\"을 사용하십시오)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (해결했다고 표시하려면 알맞게 \"git add/rm <파일>...\"을 사용하십시오)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git rm <파일>...\"을 사용하십시오)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr "커밋할 변경 사항:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr "커밋하도록 정하지 않은 변경 사항:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (무엇을 커밋할지 바꾸려면 \"git add <파일>...\"을 사용하십시오)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (무엇을 커밋할지 바꾸려면 \"git add/rm <파일>...\"을 사용하십시오)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (작업 폴더의 변경 사항을 버리려면 \"git checkout -- <파일>...\"을 사용하십"
"시오)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (하위 모듈의 추적되지 않는 파일이나 수정된 내용을 커밋하거나 버리십시오)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (커밋할 사항에 포함하려면 \"git %s <파일>...\"을 사용하십시오)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "양쪽에서 삭제:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "이 쪽에서 추가:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "저 쪽에서 삭제:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "저 쪽에서 추가:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "이 쪽에서 삭제:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "양쪽에서 추가:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "양쪽에서 수정:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "새 파일:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "복사함:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "삭제함:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "수정함:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "이름 바꿈:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "종류 바뀜:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "알 수 없음:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "병합하지 않음:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "새 커밋, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "수정한 내용, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "추적하지 않은 내용, "
-#: wt-status.c:821
+#: wt-status.c:819
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "현재 스태시에 %d개 항목이 있습니다"
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr "변경되었지만 업데이트하지 않은 하위 모듈:"
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr "커밋할 하위 모듈의 변경 사항:"
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"위의 줄을 바꾸지 마십시오.\n"
-"아래 있는 내용은 모두 제거됩니다."
+"위의 줄을 바꾸거나 지우지 마십시오.\n"
+"아래 있는 내용은 모두 무시됩니다."
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr "병합하지 않은 경로가 있습니다."
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr " (충돌을 바로잡고 \"git commit\"을 실행하십시오)"
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (병합을 중단하려면 \"git merge --abort\"를 사용하십시오)"
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr "모든 충돌을 바로잡았지만 아직 병합하는 중입니다."
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr " (병합을 마무리하려면 \"git commit\"을 사용하십시오)"
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr "am 세션 중간에 있습니다."
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr "현재 패치가 비어 있습니다."
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (충돌을 바로잡은 다음 \"git am --continue\"를 사용하십시오)"
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시오)"
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' 파일 삭제에 실패했습니다"
msgid "unexpected diff status %c"
msgstr "예상치 못한 diff 상태 %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr "파일 업데이트가 실패했습니다"
msgid "remove '%s'\n"
msgstr "'%s' 제거\n"
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
msgstr "'%s' 파일을 쓰기용으로 열 수 없습니다."
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr "패치를 쓸 수 없습니다"
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr "패치 편집에 실패했습니다"
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s'을(를) stat()할 수 없습니다"
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr "빈 패치. 중지."
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s'을(를) 적용할 수 없습니다"
-#: builtin/add.c:249
+#: builtin/add.c:251
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "다음 경로는 .gitignore 파일 중 하나 때문에 무시합니다:\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "가짜로 실행"
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr "대화식으로 고릅니다"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "대화식으로 변경된 부분을 선택합니다"
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr "현재 diff를 편집하고 적용합니다"
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr "무시하는 파일의 추가를 허용합니다"
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr "추적되는 파일을 업데이트합니다"
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
msgstr "나중에 추가할 것이라는 사실만 기록합니다"
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr "추적되고 추적되지 않는 모든 파일의 변경 사항을 추가합니다"
-#: builtin/add.c:281
+#: builtin/add.c:283
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "작업 폴더에서 제거한 경로를 무시합니다 (--no-all과 동일)"
-#: builtin/add.c:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr "추가하지 않고 인덱스만 새로 고칩니다"
-#: builtin/add.c:284
+#: builtin/add.c:286
msgid "just skip files which cannot be added because of errors"
msgstr "오류 때문에 추가할 수 없는 파일을 건너뜁니다"
-#: builtin/add.c:285
+#: builtin/add.c:287
msgid "check if - even missing - files are ignored in dry run"
msgstr "가짜로 실행했을 때 파일을 무시하는지 확인합니다"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr "목록의 파일에서 실행 가능 비트를 바꿉니다"
-#: builtin/add.c:288
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
msgstr "내장 저장소를 추가할 때 경고를 표시합니다"
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"더 자세한 정보는 \"git help submodule\"을 참고하십시오."
-#: builtin/add.c:331
+#: builtin/add.c:333
#, c-format
msgid "adding embedded git repository: %s"
msgstr "내장 깃 저장소 추가: %s"
-#: builtin/add.c:349
+#: builtin/add.c:351
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "정말로 추가하려면 -f 옵션을 사용하십시오.\n"
-#: builtin/add.c:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr "파일 추가가 실패했습니다"
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr "-A 및 -u 옵션은 서로 호환되지 않습니다"
-#: builtin/add.c:401
+#: builtin/add.c:403
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"--ignore-missing 옵션은 --dry-run 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
-#: builtin/add.c:405
+#: builtin/add.c:407
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod 파라미터 '%s'은(는) -x 또는 +x 형식이어야 합니다"
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "아무 것도 지정하지 않았으므로 아무 것도 추가하지 않습니다.\n"
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "'git add .' 명령을 실행하려고 한 것 아니었습니까?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr "인덱스 파일이 손상되었습니다"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "작성자 스크립트를 파싱할 수 없습니다"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "applypatch-msg 훅 때문에 '%s'이(가) 삭제되었습니다."
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "잘못된 형식의 입력 줄: '%s'."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek 실패"
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
msgstr "'%s' 패치를 파싱할 수 없습니다"
-#: builtin/am.c:842
+#: builtin/am.c:851
msgid "Only one StGIT patch series can be applied at once"
msgstr "한번에 하나의 StGIT 패치 시리즈만 적용할 수 있습니다"
-#: builtin/am.c:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "시각이 잘못되었습니다"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr "Date 줄이 잘못되었습니다"
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr "시간대 오프셋이 잘못되었습니다"
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr "패치 형식 검색이 실패했습니다."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' 디렉터리 만들기가 실패했습니다"
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr "패치를 쪼개는데 실패했습니다."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr "인덱스 파일을 쓸 수 없습니다"
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "이 문제를 해결했을 때 \"%s --continue\"를 실행하십시오."
-#: builtin/am.c:1172
+#: builtin/am.c:1194
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "이 패치를 건너뛰려면, 그 대신 \"%s --skip\"을 실행하십시오."
-#: builtin/am.c:1173
+#: builtin/am.c:1195
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"원래 브랜치를 복구하고 패치 적용을 중지하려면 \"%s --abort\"를 실행하십시오."
-#: builtin/am.c:1304
+#: builtin/am.c:1302
msgid "Patch is empty."
msgstr "패치가 비어 있습니다."
-#: builtin/am.c:1370
+#: builtin/am.c:1368
#, c-format
msgid "invalid ident line: %.*s"
msgstr "잘못된 신원 줄: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr "%s 커밋을 파싱할 수 없습니다"
-#: builtin/am.c:1586
+#: builtin/am.c:1584
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
-#: builtin/am.c:1588
+#: builtin/am.c:1586
msgid "Using index info to reconstruct a base tree..."
msgstr "인덱스 정보를 사용해 기본 트리를 다시 만듭니다..."
-#: builtin/am.c:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"패치를 직접 편집하셨습니까?\n"
"이 패치는 인덱스에 기록된 블롭에는 적용되지 않습니다."
-#: builtin/am.c:1613
+#: builtin/am.c:1611
msgid "Falling back to patching base and 3-way merge..."
msgstr "베이스 패치 적용 및 3-방향 병합으로 대신합니다..."
-#: builtin/am.c:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr "변경 사항에서 병합하는데 실패했습니다."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr "git write-tree가 트리를 쓰는데 실패했습니다"
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr "빈 커밋 내역에 대해 적용합니다"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr "커밋 오브젝트를 쓰는데 실패했습니다"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "다시 시작할 수 없습니다: %s이(가) 없습니다."
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"터미널에 표준 입력이 연결되지 않은 상태에서 대화형으로 실행할 수 없습니다."
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr "커밋 본문은:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "적용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모두 적용[a]: "
-#: builtin/am.c:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "변경된 인덱스: 패치를 적용할 수 없습니다 (dirty: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr "적용하는 중: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr "변경 사항 없음 -- 패치가 이미 적용되었습니다."
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "패치가 %s %.*s 위치에서 실패했습니다"
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "실패한 패치의 복사본이 다음 위치에 있습니다: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1913
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"커밋으로 표시할 사항이 남아 있지 않으면, 이미 같은 패치에서 적용된\n"
"경우일 수도 있습니다. 그런 경우에는 이 패치를 건너뛰면 됩니다."
-#: builtin/am.c:1922
+#: builtin/am.c:1920
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"충돌을 해결한 파일을 'git add'해서 해결했다고 표시해야 합니다.\n"
"파일의 \"저 쪽에서 삭제\"를 받아들이려면 `git rm`을 실행하십시오."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' 오브젝트를 파싱할 수 없습니다."
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr "인덱스 지우기에 실패했습니다"
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"마지막 'am' 실패 이후 HEAD를 옮긴 것 같습니다.\n"
"ORIG_HEAD로 되돌리지 않습니다."
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "--patch-format 옵션에 대해 잘못된 값: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<옵션>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<옵션>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr "대화형으로 실행합니다"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr "아무 동작도 하지 않습니다 (과거부터 있었던 옵션)"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "간략히 표시합니다"
-#: builtin/am.c:2227
+#: builtin/am.c:2226
msgid "add a Signed-off-by line to the commit message"
msgstr "커밋 메시지에 Signed-off-by 줄을 남깁니다"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr "UTF-8 인코딩으로 변환합니다 (기본값)"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
msgstr "git-mailinfo에 -k 옵션을 씁니다"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
msgstr "git-mailinfo에 -b 옵션을 씁니다"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
msgstr "git-mailinfo에 -m 옵션을 씁니다"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "mbox 형식에 대해 git-mailsplit에 --keep-cr 옵션을 사용합니다"
-#: builtin/am.c:2241
+#: builtin/am.c:2240
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"am.keepcr에 무관하게 git-mailsplit에 --keep-cr 옵션을 사용하지 않습니다."
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr "절취선 앞의 모든 사항을 무시합니다"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
msgstr "git-apply에 넘깁니다"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "형식"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr "패치의 형식"
-#: builtin/am.c:2276
+#: builtin/am.c:2275
msgid "override error message when patch failure occurs"
msgstr "패치 실패가 발생했을 때 오류 메시지 대신 사용합니다"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr "충돌을 해결한 다음 패치 적용을 계속합니다"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr "--continue 옵션과 동일"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr "현재 패치 건너뛰기"
-#: builtin/am.c:2287
+#: builtin/am.c:2286
msgid "restore the original branch and abort the patching operation."
msgstr "원래 브랜치를 복구하고 패치 적용 작업을 중지합니다."
# NOTE: 옵션의 의미는 이게 맞다. 원문에서는 사용자가
# --committer-date-is-author-date라는 옵션을 보고 의미를 알 수 있다고 가정하고 있다.
-#: builtin/am.c:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr "커미터 시각을 작성자 시각으로 넣습니다"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr "현재 시각을 작성자 시각으로 사용합니다"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "키-ID"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr "GPG 서명 커밋"
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
msgstr "(git-rebase를 위한 내부 용도)"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"-b/--binary 옵션은 오랜 시간 동안 아무 동작도 하지 않았으므로, 이\n"
"옵션은 제거될 예정입니다. 이제 사용하지 마십시오."
-#: builtin/am.c:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr "인덱스 읽기에 실패했습니다"
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "이전 리베이스 디렉터리 %s이(가) 아직 있고 mbox를 지정했습니다."
-#: builtin/am.c:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
"벗어난 %s 디렉터리가 발견되었습니다.\n"
"제거하려면 \"git am --abort\"를 사용하십시오."
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr "해소 작업이 진행 중입니다. 다시 시작하지 않습니다."
msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<옵션>] (-c | -C) [<과거-브랜치>] <새-브랜치>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<옵션>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<옵션>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"'%s' 브랜치를 삭제합니다. 이 브랜치는 '%s'에\n"
" 병합되었지만, HEAD에는 병합되지 않았습니다."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"'%s' 브랜치를 삭제하지 않습니다. 이 브랜치는 '%s'에\n"
" 병합되지 않았지만, HEAD에는 병합되었습니다."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "'%s'에 대한 커밋 오브젝트를 찾아볼 수 없습니다"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"'%s' 브랜치가 완전히 병합되지 않았습니다.\n"
"정말로 삭제하려면 'git branch -D %s' 명령을 실행하십시오."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "config-file 업데이트가 실패했습니다"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "-a 옵션을 -d 옵션과 같이 쓸 수 없습니다"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "HEAD에 대한 커밋 오브젝트를 찾아볼 수 없습니다"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "'%2$s' 위치에 체크아웃한 '%1$s' 브랜치를 삭제할 수 없습니다"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "리모트 추적 '%s' 브랜치가 없습니다."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "'%s' 브랜치가 없습니다."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "리모트 추적 '%s' 브랜치를 삭제하는데 오류"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "'%s' 브랜치를 삭제하는데 오류"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "리모트 추적 '%s' 브랜치를 삭제합니다. (과거 %s)\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "%s 브랜치 삭제 (과거 %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "포맷 문자열을 파싱할 수 없습니다"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s 브랜치를 %s 위치에 리베이스합니다"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s 브랜치를 %s 위치에서 bisect합니다"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "브랜치 위에 없으면서 현재 브랜치를 복사할 수 없습니다."
+
+#: builtin/branch.c:472
msgid "cannot rename the current branch while not on any."
msgstr "브랜치 위에 없으면서 현재 브랜치 이름을 바꿀 수 없습니다."
-#: builtin/branch.c:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "잘못된 브랜치 이름: '%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr "브랜치 이름 바꾸기 실패"
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "브랜치 복사 실패"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "이름이 잘못된 '%s' 브랜치를 복사합니다"
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "이름이 잘못된 '%s' 브랜치의 이름을 다르게 바꿉니다"
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "브랜치 이름을 %s(으)로 바꾸지만, HEAD를 업데이트하지 않습니다!"
-#: builtin/branch.c:506
+#: builtin/branch.c:528
msgid "Branch is renamed, but update of config-file failed"
msgstr "브랜치의 이름을 바꾸지만, config-file 업데이트가 실패했습니다"
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "브랜치를 복사했지만, config-file 업데이트가 실패했습니다"
+
+#: builtin/branch.c:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"'%c' 문자로 시작하는 줄은 무시됩니다.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr "일반 옵션"
# FIXME: give twice?
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr "해시와 제목을 표시하고, 업스트림 브랜치에 대한 위치를 표시합니다"
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr "여러가지 안내 메시지를 표시하지 않습니다"
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr "추적 모드를 설정합니다 (git-pull(1) 참고)"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "ì\97\85ì\8a¤í\8a¸ë¦¼ ì \95보를 ë°\94ê¿\89니다"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "ì\82¬ì\9a©í\95\98ì§\80 ì\95\8aì\8aµ니다"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr "업스트림"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr "업스트림 정보를 바꿉니다"
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
msgstr "업스트림 정보를 해제합니다"
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr "여러 색으로 출력합니다"
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr "리모트 추적 브랜치에 대해 동작합니다"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr "커밋이 있는 브랜치만 표시합니다"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr "커밋이 들어있지 않은 브랜치만 표시합니다"
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr "특정 git-branch 동작:"
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr "리모트와 로컬의 브랜치 목록을 모두 표시합니다"
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr "완전히 병합된 브랜치를 삭제합니다"
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr "브랜치를 삭제합니다 (병합되지 않았더라도)"
-#: builtin/branch.c:579
+#: builtin/branch.c:603
msgid "move/rename a branch and its reflog"
msgstr "브랜치와 그 reflog를 옮기거나 이름을 바꿉니다"
-#: builtin/branch.c:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr "대상이 이미 있더라도 브랜치를 옮기거나 이름을 바꿉니다"
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "브랜치와 그 reflog를 복사합니다"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "대상이 이미 있더라도 브랜치를 복사합니다"
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr "브랜치 이름 목록을 표시합니다"
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr "브랜치의 reflog를 만듭니다"
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr "브랜치의 설명을 편집합니다"
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr "강제로 만들고, 옮기거나 이름을 바꾸고, 삭제합니다"
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr "병합되는 브랜치만 표시합니다"
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr "병합되지 않는 브랜치만 표시합니다"
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr "목록을 여러 열로 표시합니다"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "키"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "정렬한 기준이 되는 필드 이름"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "오브젝트"
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr "해당 오브젝트의 브랜치만 표시합니다"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "정렬과 필터링은 대소문자를 구분하지 않습니다"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "출력에 사용할 형식"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr "레퍼런스/헤드 아래에 HEAD가 없습니다!"
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr "--column 및 --verbose 옵션은 호환되지 않습니다"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr "브랜치 이름이 필요합니다"
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr "분리된 HEAD에 대한 설명을 부여할 수 없습니다"
-#: builtin/branch.c:686
+#: builtin/branch.c:713
msgid "cannot edit description of more than one branch"
msgstr "여러 브랜치에 대한 설명을 편집할 수 없습니다"
-#: builtin/branch.c:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "아직 '%s' 브랜치에 커밋이 없습니다."
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
msgstr "이름이 '%s'인 브랜치가 없습니다."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "이름 바꾸기 작업에 대해 브랜치가 너무 많습니다"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "복사 작업에 대해 브랜치가 너무 많습니다"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "ì\83\88 ì\97\85ì\8a¤í\8a¸ë¦¼ì\9d\84 ì\84¤ì \95í\95\98ë\8a\94ë\8d° ë¸\8cë\9e\9cì¹\98가 너무 많습니다"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "ì\9d´ë¦\84 ë°\94꾸기 ì\9e\91ì\97\85ì\97\90 ë\8c\80í\95´ ì\9d¸ì\9e\90가 너무 많습니다"
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "새 업스트림을 설정하는데 인자가 너무 많습니다"
+
+#: builtin/branch.c:756
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"HEAD의 업스트림을 %s(으)로 설정할 수 없습니다. 어떤 브랜치도 가리키지 않습니"
"다."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
msgstr "그런 브랜치가 ('%s') 없습니다"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' 브랜치가 없습니다"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "업스트림 설정을 해제하는데 브랜치가 너무 많습니다"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "업스트림 설정을 해제하는데 인자가 너무 많습니다"
-#: builtin/branch.c:743
+#: builtin/branch.c:779
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"HEAD의 업스트림 설정을 해제할 수 없습니다. 어떤 브랜치도 가리키지 않습니다."
-#: builtin/branch.c:749
+#: builtin/branch.c:785
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' 브랜치에 업스트림 정보가 없습니다"
-#: builtin/branch.c:763
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr "'HEAD'를 수동으로 만드는 건 앞뒤가 맞지 않습니다"
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"'git branch'에 대해 -a 및 -r 옵션은 브랜치 이름과 같이 쓰면 앞뒤가 맞지 않습"
"니다"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"--set-upstream 옵션은 더 이상 사용되지 않고 제거될 예정입니다. --track 또는 "
-"--set-upstream-to 옵션을 사용해 보십시오\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"'%s'을(를) 만들고 '%s'을(를) 추적하게 하려면, 다음을 하십시오:\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr "'--set-upstream' 옵션은 더 이상 사용되지 않고 제거될 예정입니다. '--track' 또는 '--set-upstream-to' 옵션을 사용해 보십시오."
#: builtin/bundle.c:45
#, c-format
msgid "Need a repository to unbundle."
msgstr "번들을 해제하려면 저장소가 필요합니다."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<종류>는 다음 중 하나가 될 수 있습니다: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "오브젝트 종류를 봅니다"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "오브젝트 크기를 봅니다"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "오류가 없을 때 0을 리턴하고 끝냅니다"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "오브젝트의 내용을 예쁘게 표시합니다"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 textconv를 실행합니다"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 필터를 실행합니다"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr "블롭"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "--textconv/--filters 옵션에 경로를 지정합니다"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s 및 -t 옵션이 손상된 오브젝트에 대해 동작하도록 허용합니다"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "--batch 출력에 대해 버퍼링합니다"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr "표준 입력에서 입력된 오브젝트의 정보와 내용을 표시합니다"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "표준 입력에서 입력된 오브젝트의 정보를 표시합니다"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"트리 내부의 심볼릭 링크를 따라갑니다 (--batch 또는 --batch-check와 같이 사용)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "--batch 또는 --batch-check에서 모든 오브젝트를 표시합니다"
msgid "terminate input and output records by a NUL character"
msgstr "NUL 문자를 기준으로 자료 입력 및 출력을 멈춥니다"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "진행 상황 표시를 하지 않습니다"
msgstr "내용을 임시 파일에 씁니다"
#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr "문자열"
msgid "path '%s' is unmerged"
msgstr "'%s' 경로를 병합하지 않았습니다"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr "현재 인덱스를 먼저 해결해야 합니다"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr "HEAD의 현재 위치는"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr "HEAD를 업데이트할 수 없습니다"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' 브랜치 리셋\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
#, c-format
msgid "Already on '%s'\n"
msgstr "이미 '%s'에 있습니다\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 그리고 %d개 더.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <새-브랜치-이름> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr "리비전 walk에 내부 오류"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr "이전 HEAD 위치는"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr "현재 위치가 만들 예정인 브랜치에 있습니다"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr "하나의 레퍼런스만 지정해야 하지만 %d개를 지정했습니다."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr "잘못된 레퍼런스: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr "레퍼런스가 트리가 아닙니다: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr "브랜치를 전환하는데 경로를 사용할 수 없습니다"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 옵션은 브랜치를 전환할 때 쓸 수 없습니다"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 옵션은 '%s' 옵션과 같이 쓸 수 없습니다"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "브랜치를 커밋이 아닌 '%s'(으)로 전환할 수 없습니다"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr "브랜치"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr "새 브랜치를 만들고 가져옵니다"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr "새 브랜치에 대한 reflog를 만듭니다"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr "HEAD를 해당 커밋에서 분리합니다"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr "새 브랜치에 대한 업스트림 정보를 설정합니다"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr "새-브랜치"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr "상위 브랜치가 없는 새 브랜치"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr "병합되지 않은 파일에 대해 우리쪽 버전을 가져옵니다"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr "병합되지 않은 파일에 대해 상대편 버전을 가져옵니다"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr "강제로 체크아웃합니다 (로컬에서 수정한 사항을 버립니다)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr "새 브랜치에 대해 3-방향 병합을 수행합니다"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "무시하는 파일을 업데이트합니다 (기본값)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr "스타일"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr "충돌 스타일 (merge 또는 diff3)"
# FIXME: 의미 불명
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr "경로명세를 드문 항목에만 제한하지 않습니다"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "'git checkout <없는-브랜치>'에 대해 추측합니다"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
msgid "do not check if another worktree is holding the given ref"
msgstr "다른 작업폴더에 주어진 레퍼런스가 있는지 확인하지 않습니다"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "강제로 진행 상황을 표시합니다"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B 및 --orphan 옵션은 서로 호환되지 않습니다"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr "--track 옵션은 브랜치 이름이 필요합니다"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr "브랜치 이름이 없습니다. -b 옵션을 사용해 보십시오"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr "경로 명세가 잘못되었습니다"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s'은(는) 커밋이 아니고 여기에서 '%s' 브랜치를 만들 수 없습니다"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach 옵션은 경로 인자를 받지 않습니다 '%s'"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "failed to remove %s"
msgstr "%s 제거에 실패했습니다"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
"foo - 유일한 접두어에 해당하는 항목 선택\n"
" - (빈 입력) 선택하지 않음\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
"* - 모든 항목 선택\n"
" - (빈 입력) 선택 마침\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "어라라 (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "무시할 패턴을 입력하십시오>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "경고: 다음에 해당하는 항목을 찾을 수 없습니다: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "삭제할 항목을 선택하십시오"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "%s 제거합니까 [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "끝.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - 이 화면 표시\n"
"? - 프롬프트 선택 도움말"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** 명령 ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr "무엇을 할까요"
-#: builtin/clean.c:828
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "다음 항목을 제거할 예정입니다:"
-#: builtin/clean.c:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "지울 파일이 이제 없으므로 끝냅니다."
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "제거할 파일 이름을 표시하지 않습니다"
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr "강제"
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "대화형 지우기"
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "전체 디렉터리 제거"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "패턴"
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "규칙을 무시하려면 <패턴>을 추가하십시오"
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "무시한 파일도 제거"
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "무시한 파일만 제거"
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x 및 -X 옵션은 같이 쓸 수 없습니다"
-#: builtin/clean.c:938
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce가 true로 설정되었고 -i, -n, -f 옵션 중 하나도 쓰지 않았습"
"니다. 지우지 않습니다"
-#: builtin/clean.c:941
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce 기본값이 true이고 -i, -n, -f 옵션 중 하나도 쓰지 않았습니"
"다. 지우지 않습니다"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "체크아웃을 만들지 않습니다"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "간략한 저장소를 만듭니다"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "로컬 저장소에서 복제합니다"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "로컬 하드링크를 사용하지 않고, 항상 복사합니다"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "공유 저장소로 설정합니다"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "경로명세"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "복제한 결과물에서 하위 모듈을 초기화합니다"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "병렬적으로 복제하는 하위모듈 개수"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "서식-디렉터리"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "서식을 사용할 디렉터리 위치"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr "레퍼런스 저장소"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "복제할 경우에만 --reference를 사용합니다"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "이름"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "업스트림 추적에 'origin' 대신 <이름>을 사용합니다"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "리모트의 git-upload-pack 경로"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
#: builtin/pull.c:205
msgid "depth"
msgstr "깊이"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "지정한 깊이의 얕은 복제를 만듭니다"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
#: parse-options.h:142
msgid "time"
msgstr "시각"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "지정한 시간 이후의 얕은 복제를 만듭니다"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr "리비전"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr "리비전을 제외해 얕은 복제의 커밋 내역을 깊게 만듭니다"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "하나의 브랜치만 복제합니다 (HEAD 또는 --branch로 지정)"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "태그를 복제하지 않습니다. 나중에 가져올 때도 태그를 따르지 않습니다."
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "모든 복제한 하위 모듈은 얕은 모듈입니다"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "깃 디렉터리를 작업 폴더와 별개의 위치에 놓습니다"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "키=값"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "새 저장소 안에서 설정합니다"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "IPv4 주소만 사용합니다"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "IPv6 주소만 사용합니다"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"디렉터리 이름을 알아낼 수 없습니다.\n"
"명령행에서 디렉터리를 지정하십시오"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "정보: '%s'에 대한 보조 파일을 추가할 수 없습니다: %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "'%s'을(를) 여는데 실패"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "'%s'이(가) 있지만 디렉터리가 아닙니다"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "'%s'에 대해 stat()이 실패했습니다\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' 링크를 만드는데 실패했습니다"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "파일을 '%s'(으)로 복사하는데 실패했습니다"
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr "완료.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"'git status' 명령으로 무엇을 체크아웃했는지 살펴볼 수 있고\n"
"'git checkout -f HEAD'로 체크아웃을 다시 할 수 있습니다\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "복제할 리모트의 %s 브랜치를 찾을 수 없습니다."
-#: builtin/clone.c:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr "리모트에서 필요한 오브젝트를 모두 보내지 않았습니다"
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr "%s을(를) 업데이트할 수 없습니다"
-#: builtin/clone.c:719
+#: builtin/clone.c:720
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "리모트 HEAD가 없는 레퍼런스를 참고하므로, 체크아웃할 수 없습니다.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "작업 폴더를 체크아웃할 수 없습니다"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "파라미터를 설정 파일에 쓸 수 없습니다"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "정리용으로 repack할 수 없습니다"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "보조 임시 파일을 삭제할 수 없습니다"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr "너무 인자가 많습니다."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "복제할 저장소를 지정해야 합니다."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 및 --origin %s 옵션은 호환되지 않습니다."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 및 --separate-git-dir 옵션은 호환되지 않습니다."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' 저장소가 없습니다"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr "깊이가(%s) 0보다 큰 수가 아닙니다"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "대상 경로가('%s') 이미 있고 빈 디렉터리가 아닙니다."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "작업 폴더가('%s') 이미 있습니다."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "'%s'의 앞 디렉터리를 만들 수 없습니다"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "간략한 저장소로('%s') 복제합니다...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "'%s'에 복제합니다...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 "
"것과 호환되지 않습니다"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십"
"시오."
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하"
"십시오."
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "원본 저장소가 얕은 저장소이므로, --local 옵션을 무시합니다"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local 옵션은 무시됩니다"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr "%s의 복제 방법을 알지 못합니다"
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "리모트의 %s 브랜치가 업스트림 %s에 없습니다"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr "빈 저장소를 복제한 것처럼 보입니다."
"그 다음에 \"git cherry-pick --continue\"를 하면 나머지 커밋에\n"
"대해 커밋 빼오기를 다시 시작합니다.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "HEAD 트리 오브젝트의 묶음을 푸는데 실패했습니다"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "임시 인덱스를 만들 수 없습니다"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "대화형 추가가 실패했습니다"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "임시 인덱스를 업데이트할 수 없습니다"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "주요 캐시 트리를 업데이트하는데 실패했습니다"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "new_index 파일에 쓸 수 없습니다"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "병합하는 중 부분 커밋을 할 수 없습니다."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "커밋 빼오기를 하는 중 부분 커밋을 할 수 없습니다."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "임시 인덱스 파일을 쓸 수 없습니다"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' 커밋에 작성자 헤더가 없습니다"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' 커밋의 작성자 헤더 형식이 잘못되었습니다"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "--author 파라미터 형식이 잘못되었습니다"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"현재 커밋 메시지에서 사용되지 않는 주석 문자를\n"
"선택할 수 없습니다"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr "%s 커밋을 찾아볼 수 없습니다"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(표준 입력에서 로그 메시지를 읽음)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "표준 입력에서 로그 메시지를 읽을 수 없습니다"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "'%s' 로그 파일을 읽을 수 없습니다"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG를 읽을 수 없습니다"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG를 읽을 수 없습니다"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "커밋 서식을 쓸 수 없습니다"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"다시 시도하십시오.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
"\t%s\n"
"다시 시도하십시오.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"변경 사항에 대한 커밋 메시지를 입력하십시오. '%c' 문자로 시작하는\n"
"줄은 무시되고, 메시지를 입력하지 않으면 커밋이 중지됩니다.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"줄은 보존되니, 필요하면 직접 제거하십시오. 메시지를 입력하지\n"
"않으면 커밋이 중지됩니다.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s작성자: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%s시각: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s커미터: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr "트리를 만드는데 오류"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "메시지를 -m 또는 -F 옵션으로 입력하십시오.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' 옵션이 '이름 <전자메일>' 형식이 아니고 기존 작성자에도 없습니다"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "추적되지 않는 파일 모드가 ('%s') 잘못되었습니다"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr "--long 및 -z 옵션은 호환되지 않습니다"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
msgid "Using both --reset-author and --author does not make sense"
msgstr "--reset-author 및 --author 옵션을 모두 사용하면 앞뒤가 맞지 않습니다"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr "바꿀 사항이 없습니다."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr "병합 중에 있습니다 -- 커밋을 바꿀 수 없습니다."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "커밋 빼오기 중에 있습니다 -- 커밋을 바꿀 수 없습니다."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash 및 --fixup 옵션은 같이 쓸 수 없습니다"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup 옵션 중에 하나만 사용할 수 있습니다."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "-m 옵션은 -c/-C/-F/--fixup 옵션과 같이 쓸 수 없습니다."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 옵션은 -C, -c 또는 --amend 옵션과 같이 써야 합니다."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
"다."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr "경로가 없이 --include/--only 옵션을 쓰면 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "잘못된 정리 모드 %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "-a 옵션과 경로를 같이 사용하면 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr "상태를 간략하게 표시합니다"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr "브랜치 정보를 표시합니다"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
msgid "show stash information"
msgstr "스태시 정보를 표시합니다"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr "버전"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr "컴퓨터가 읽을 수 있는 형식"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr "긴 형식으로 상태를 표시합니다 (기본값)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr "NUL 문자로 항목을 끝냅니다"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "모드"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"추적되지 않는 파일을 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr "무시되는 파일을 표시합니다"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr "언제"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"하위 모듈의 변경을 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: "
"all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr "추적되지 않는 파일의 목록을 여러 열로 표시합니다"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr "새로 만든 커밋을 찾아볼 수 없습니다"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr "새로 만든 커밋을 파싱할 수 없습니다"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr "HEAD 분리됨"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr " (최상위-커밋)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr "성공적인 커밋 후에 요약을 표시하지 않습니다"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr "커밋 메시지 서식에 diff를 표시합니다"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr "커밋 메시지 옵션"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr "파일에서 메시지를 읽습니다"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr "작성자"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr "커밋의 작성자를 지정합니다"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr "시각"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr "커밋의 시각을 지정합니다"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "메시지"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr "커밋 메시지"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "커밋"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr "지정한 커밋의 메시지를 재사용하고 편집합니다"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr "지정한 커밋에서 메시지를 재사용합니다"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
msgstr "지정한 커밋을 수정하는데 autosquash 형식 메시지를 사용합니다"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
msgstr "지정한 커밋을 합치는데 autosquash 형식 메시지를 사용합니다"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "커밋을 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같이 사용)"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "Signed-off-by: 줄을 추가합니다"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr "지정한 서식 파일을 사용합니다"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr "커밋 편집을 강제합니다"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr "기본값"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "메시지에서 공백과 #주석을 지웁니다"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr "커밋 메시지 서식에 상태를 포함합니다"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG 서명 커밋"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr "커밋 내용 옵션"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr "변경된 파일을 모두 커밋합니다"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr "지정한 파일을 커밋할 인덱스에 추가합니다"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr "대화형으로 파일을 추가합니다"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr "대화형으로 변경 사항을 추가합니다"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr "지정한 파일만 커밋합니다"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
msgstr "커밋 전 후크와 커밋 메시지 후크를 건너뜁니다"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr "무엇을 커밋할지 표시합니다"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr "바로 앞 커밋을 바꿉니다"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
msgstr "다시쓰기 후 후크를 건너뜁니다"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr "빈 변경 사항을 기록하도록 허용합니다"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr "빈 메시지와 같이 변경 사항을 기록하도록 허용합니다"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr "HEAD 커밋을 파싱할 수 없습니다"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "손상된 MERGE_HEAD 파일 (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE를 읽을 수 없습니다"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "커밋 메시지를 읽을 수 없습니다: %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "커밋을 중지합니다. 커밋 메시지가 비어 있습니다.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n"
+
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "--local can only be used inside a git repository"
msgstr "--local 옵션은 깃 저장소 안에서만 쓸 수 있습니다"
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
msgstr "%s 설정 파일을 만들 수 없습니다"
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"%s을(를) 변경하려면 정규식을 쓰거나, --add 또는 --replace-all 옵션을\n"
"사용하십시오."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "사람이 읽기 좋은 형식으로 크기를 표시합니다"
msgid "annotated"
msgstr "annotated"
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr "주석 달린 %s 태그를 사용할 수 없습니다"
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "주석 달린 %s 태그에 내장된 이름이 없습니다"
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "'%s' 태그가 실제 여기 '%s'입니다"
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr "올바른 오브젝트 이름이 아닙니다 (%s)"
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s은(는) 올바른 '%s' 오브젝트가 아닙니다"
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "어떤 태그도 '%s'와(과) 정확히 일치하지 않습니다"
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr "%s 설명을 위해 검색하는 중\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "%s에서 검색 마침\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"어떤 주석 달린 태그도 '%s'을(를) 설명하지 않습니다.\n"
"하지만 주석 달리지 않은 태그가 있습니다: --tags 옵션을 해 보십시오."
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"어떤 태그도 '%s'을(를) 설명할 수 없습니다.\n"
"--always 옵션을 써 보거나, 태그를 만들어 보십시오."
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr "커밋 %lu개를 가로질렀습니다\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"태그를 %i개 넘게 찾았습니다. 가장 최근의 %i개 목록을\n"
"표시합니다. %s 위치에서 검색을 중지합니다.\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr "커밋 다음에 오는 태그를 찾습니다"
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr "표준 오류에서 검색 전략을 디버깅합니다"
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr "모든 레퍼런스를 사용합니다"
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr "모든 태그를, 주석 달리지 않은 태그까지 사용합니다"
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr "항상 긴 형식을 사용합니다"
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr "첫 번째 이전 커밋만 따라갑니다"
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr "정확히 일치하는 항목만 출력합니다"
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr "<n>개의 가장 최근의 태그만 고려합니다 (기본값: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr "<패턴>과 일치하는 태그만 고려합니다"
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr "<패턴>과 일치하는 태그를 고려하지 않습니다"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "대안으로 요약한 커밋 오브젝트를 표시합니다"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr "표시"
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "변경된 작업 폴더에 <표시>를 뒤에 붙입니다 (기본값: \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "망가진 작업 폴더에 <표시>를 뒤에 붙입니다 (기본값: \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 옵션은 --abbrev=0 옵션과 호환되지 않습니다"
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr "이름이 없습니다. 아무것도 설명할 수 없습니다."
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 옵션은 커밋같은 항목과 호환되지 않습니다"
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 옵션은 커밋같은 항목과 호환되지 않습니다"
msgid "invalid option: %s"
msgstr "잘못된 옵션: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr "깃 저장소가 아닙니다"
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
msgstr "잘못된 '%s' 오브젝트가 주어졌습니다."
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "두 개보다 많은 블롭이 주어졌습니다: '%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
msgstr "처리하지 않은 '%s' 오브젝트가 주어졌습니다."
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<옵션>] [<커밋> [<커밋>]] [--] [<경로>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "실패: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "%s 심볼릭 링크 파일을 읽을 수 없습니다"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "%2$s 심볼릭 링크에 대한 %1$s 오브젝트를 읽을 수 없습니다"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"컴바인드 diff 형식은 ('-c' 및 '--cc') 디렉터리 diff 모드에서는\n"
"('-d' 및 '--dir-diff') 지원하지 않습니다."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "두 파일이 수정되었습니다: '%s' 및 '%s'."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "작업 폴더가 남겨져 있습니다."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "임시 파일이 '%s'에 있습니다."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "이 파일을 지우거나 복구할 수 있습니다."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.tool` 대신 `diff.guitool`을 사용하십시오"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "전체 디렉터리 diff를 수행합니다"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "diff 도구를 실행하기 전에 프롬프트를 표시하지 않습니다"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "dir-diff 모드에서 심볼릭 링크를 사용합니다"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr "<도구>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "지정한 diff 도구를 사용합니다"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "`--tool` 옵션에서 사용할 수 있는 diff 도구 목록을 표시합니다"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
"실행한 diff 도구가 0이 아닌 코드를 리턴하면 'git-difftool'이 끝나게 합니다"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "<command>"
msgstr "<명령>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "diff를 보는 명령어를 사용자가 지정합니다"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr "--tool=<도구> 옵션에 <도구>가 주어지지 않았습니다"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "--extcmd=<명령> 옵션에 <명령>이 주어지지 않았습니다"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-옵션]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "오브젝트 <n>개 뒤에 진행 상황을 표시합니다"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "서명한 태그의 처리 방식을 선택합니다"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "필터링한 오브젝트에 대한 태그의 처리 방식을 선택합니다"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "이 파일로 표시를 내보냅니다"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "이 파일에서 표시를 가져옵니다"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "태그에 태그붙인 사람이 없을 때 가짜로 만듭니다"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "커밋 마다 전체 트리를 출력합니다"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "스트림을 끝내는데 완료 기능을 사용합니다"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "블롭 데이터의 출력을 건너뜁니다"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "레퍼런스명세"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "레퍼런스명세를 내보낸 레퍼런스에 적용합니다"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "출력을 익명화합니다"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<옵션>] [<저장소> [<레퍼런스명세>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<옵션>] <그룹>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<옵션>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "모든 리모트에서 가져옵니다"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "덮어쓰지 말고 .git/FETCH_HEAD에 덧붙입니다"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "리모트 쪽에 묶음을 업로드할 경로"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "로컬 브랜치를 강제로 덮어씁니다"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr "여러 리모트에서 가져옵니다"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "모든 태그와 관련 오브젝트를 가져옵니다"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr "병렬적으로 받아오는 하위모듈 개수"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr "리모트에 이제 없는 리모트 추적 브랜치를 잘라냅니다"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr "주문형"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr "하위 모듈 재귀적으로 가져오기 방식을 설정합니다"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "다운로드한 묶음을 보존합니다"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr "HEAD 레퍼런스 업데이트를 허용합니다"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "얕은 복제의 커밋 내역을 깊게 만듭니다"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr "얕은 복제의 커밋 내역을 시간을 기준으로 깊게 만듭니다"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "완전한 저장소로 전환합니다"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr "디렉터리"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr "하위 모듈 경로 출력의 앞에 이 디렉터리를 붙입니다"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "하위 모듈을 재귀적으로 가져올 때 기본값 (설정 파일보다 낮은 우선 순위)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow를 업데이트하는 레퍼런스를 허용합니다"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr "레퍼런스맵"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "레퍼런스맵 가져오기를 지정합니다"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr "리모트 레퍼런스 HEAD를 찾을 수 없습니다"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output 설정에 잘못된 값이 있습니다: %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr "%s 오브젝트가 없습니다"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr "[최신 상태]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr "[거부됨]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr "현재 브랜치에서 가져올 수 없음"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr "[태그 업데이트]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr "로컬 레퍼런스를 업데이트할 수 없습니다"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr "[새로운 태그]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr "[새로운 브랜치]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr "[새로운 레퍼런스]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr "강제 업데이트"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr "정방향 진행이 아님"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s이(가) 모든 필요한 오브젝트를 보내지 않았습니다\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "얕은 최상위의 업데이트가 허용되지 않으므로 %s을(를) 거부합니다"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr "%.*s URL에서\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"업데이트할 수 없는 로컬 레퍼런스가 있습니다. 과거 충돌 브랜치를\n"
" 제거하려면 'git remote prune %s' 명령을 실행해 보십시오"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 레퍼런스가 연결이 끊어지게 됩니다)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 레퍼런스가 연결이 끊어졌습니다)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr "[삭제됨]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr "(없음)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "간략한 저장소가 아닌 저장소의 현재 %s 브랜치로 가져오기를 거절합니다"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" 옵션의 \"%s\" 값은 %s에 대해 올바르지 않습니다"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "\"%s\" 옵션은 '%s'에 대해 무시됩니다\n"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "'%s'에서 가져오는 방법을 알 수 없습니다"
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr "%s을(를) 가져오는 중\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "%s을(를) 가져올 수 없습니다"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"리모트 저장소를 지정하지 않았습니다. 새 리비전을 가져올 수 있는\n"
"URL이나 리모트 이름을 지정하십시오."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr "태그 이름을 지정해야 합니다."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 옵션에 음수 깊이는 지원하지 않습니다"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 및 --unshallow 옵션은 같이 쓸 수 없습니다"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"완전한 저장소에 대해 --unshallow 옵션을 사용하는 건 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 명령에 저장소 인자가 없습니다"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 명령은 레퍼런스명세 인자와 같이 쓰면 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr "그런 리모트나 리모트 그룹이 없습니다: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "그룹을 가져오고 레퍼런스명세를 지정하면 앞뒤가 맞지 않습니다"
msgstr ""
"git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파일>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
msgid "populate log with at most <n> entries from shortlog"
msgstr "shortlog에서 최대 <n>개 로그를 표시합니다"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr "--log와 동일 (없어질 예정)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr "텍스트"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr "<텍스트>를 시작 메시지로 사용합니다"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr "읽어들일 파일"
msgid "show only <n> matched refs"
msgstr "<n>개의 해당하는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "포맷 색을 유지합니다"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "주어진 오브젝트를 가리키는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "병합하는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "병합하지 않는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "커밋이 들어 있는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "커밋이 들어 있지 않은 레퍼런스만 표시합니다"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "오브젝트 디렉터리를 확인하는 중입니다"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<옵션>] [<오브젝트>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "접근할 수 없는 오브젝트를 표시합니다"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "연결이 끊어진 오브젝트를 표시합니다"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "태그를 알립니다"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "최상위 노드를 알립니다"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "인덱스 오브젝트 헤드 노드를 만듭니다"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "묶음과 보조 오브젝트도 만듭니다"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "연결만 확인합니다"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "더 엄격하게 확인합니다"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr ".git/lost-found 안에 연결이 끊어진 오브젝트를 씁니다"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "진행 상황을 표시합니다"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "접근할 수 없는 오브젝트의 이름을 자세히 표시합니다"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "오브젝트를 확인합니다"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<옵션>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "'%s'에 fstat()하는데 실패했습니다: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "'%s'에 stat()할 수 없습니다"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "레퍼런스하지 않는 오브젝트를 잘라냅니다"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "더 자세히 검사합니다 (실행 시간 늘어남)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "자동 가비지컬렉터 모드를 사용합니다"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "이미 가비지컬렉터가 실행 중이더라도 강제로 가비지컬렉터를 실행합니다"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "gc.logexpiry 값을 (%s) 파싱하는데 실패했습니다"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "최적 성능을 위해 백그라운드에서 자동으로 저장소의 묶음을 만듭니다.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "최적 성능을 위해 자동으로 저장소의 묶음을 만듭니다.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "수동 관리 작업은 \"git help gc\" 내용을 참고하십시오.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"가비지컬렉터가 이미 '%s' 컴퓨터에서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --"
"force를 사용하십시오)"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<옵션>] [-e] <패턴> [<리비전>...] [[--] <경로>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: 스레드를 만드는데 실패했습니다: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "잘못된 스레드 수를 %2$s에 대해 지정했습니다 (%1$d)"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr "스레드 기능이 없습니다. %s 무시"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr "트리를 읽을 수 없습니다 (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, c-format
msgid "unable to grep from object of type %s"
msgstr "종류가 %s인 오브젝트에서 grep을 할 수 없습니다"
-#: builtin/grep.c:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "`%c' 옵션에는 숫자 값이 와야 합니다"
-#: builtin/grep.c:999
+#: builtin/grep.c:781
msgid "search in index instead of in the work tree"
msgstr "작업 폴더 대신에 인덱스에서 검색합니다"
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr "깃으로 관리하지 않은 내용에서 찾습니다"
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr "추적되는 파일과 추적되지 않는 파일 모두에서 검색합니다"
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'로 지정한 파일을 무시합니다"
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr "각 하위 모듈에 재귀적으로 검색합니다"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "베이스이름"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "프로젝트의 베이스일므을 출력 앞에 붙입니다"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr "일치하지 않는 줄을 표시합니다"
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr "대소문자 구별하지 않고 비교합니다"
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr "단어 경계 부분에 대해서만 패턴을 맞춥니다"
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr "바이너리 파일을 텍스트로 처리합니다"
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr "바이너리 파일에서 패턴을 맞추지 않습니다"
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr "textconv 필터를 사용해 바이너리 파일을 처리합니다"
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr "최대 <깊이> 단계만큼 내려갑니다"
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
msgstr "POSIX 확장 정규식을 사용합니다"
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr "기본 POSIX 정규식을 사용합니다 (기본값)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr "패턴을 고정 문자열로 해석합니다"
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr "펄과 호환되는 정규식을 사용합니다"
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr "줄 번호를 표시합니다"
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr "파일 이름을 표시하지 않습니다"
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr "파일 이름을 표시합니다"
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr "파일 이름을 최상위 디렉터리 상대 경로로 표시합니다"
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
msgid "show only filenames instead of matching lines"
msgstr "일치하는 줄을 표시하지 않고 파일 이름만 표시합니다"
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches 옵션과 동일"
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr "일치하지 않는 파일의 이름만 표시합니다"
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr "파일 이름 다음에 NUL을 출력합니다"
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
msgid "show the number of matches instead of matching lines"
msgstr "일치하는 줄을 표시하지 않고 일치하는 수를 표시합니다"
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr "일치하는 부분을 강조합니다"
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr "다른 파일 사이에 일치하는 부분의 사이에 빈 줄을 출력합니다"
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
msgid "show filename only once above matches from same file"
msgstr "같은 파일에서 여러 개가 일치하면 파일 이름을 한 번만 표시합니다"
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
msgid "show <n> context lines before and after matches"
msgstr "일치하는 부분 앞뒤에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr "일치하는 부분 앞에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr "일치하는 부분 뒤에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr "<n>개의 작업 스레드를 사용합니다"
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr "-C NUM 옵션의 줄임"
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
msgid "show a line with the function name before matches"
msgstr "일치 항목 앞에 함수 이름 줄을 표시합니다"
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr "들어 있는 함수를 표시합니다"
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr "파일에서 패턴을 읽습니다"
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr "<패턴>과 일치"
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr "-e 옵션으로 지정한 패턴을 결합합니다"
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr "출력하지 않고 일치하는 항목을 exit() 상태 번호로 리턴합니다"
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
msgid "show only matches from files that match all patterns"
msgstr "모든 패턴과 일치하는 파일의 일치하는 부분만 표시합니다"
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
msgstr "grep 표현식에 대한 파싱 트리를 표시합니다"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr "페이저"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr "일치하는 파일을 페이저 프로그램에서 표시합니다"
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "grep(1) 실행을 허용합니다 (이 빌드에서는 무시)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr "패턴을 지정하지 않았습니다."
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 또는 --untracked 옵션은 리비전과 같이 쓸 수 없습니다"
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr "리비전을 찾아낼 수 없습니다: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "잘못된 스레드 수를 지정했습니다 (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
msgstr "스레드 기능이 없습니다. --threads 옵션 무시"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 옵션은 작업 폴더에서만 동작합니다"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr "--recurse-submodules와 같이 지원하지 않는 옵션입니다."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"--cached 또는 --untracked 옵션은 --no-index 옵션과 같이 쓸 수 없습니다."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 옵션은 추적되는 내용에 대해 쓸 수 없습니다."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr "--cached 옵션과 트리를 모두 지정했습니다."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient '%d' 버전은 너무 과거 (< 22) 버전입니다."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "실행 실패: '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': 지원하지 않는 맨 페이지 보기 프로그램 경로.\n"
"대신에 'man.<도구>.cmd' 옵션을 사용해 보십시오."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 지원하지 않는 맨 페이지 보기 프로그램 명령.\n"
"대신에 'man.<도구>.path' 옵션을 사용해 보십시오."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': 알 수 없는 맨 페이지 보기 프로그램."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "요청을 처리한 맨 페이지 보기 프로그램이 없습니다"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "요청을 처리한 인포 페이지 보기 프로그램이 없습니다"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "경로마다 속성 정의하기"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "매일매일 사용하는 20개 내외의 깃 명령"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "깃 용어 사전"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "의도적으로 추적하지 않는 파일을 무시하게 지정하기"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "하위 모듈 속성 정의하기"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "깃의 리비전 및 범위를 지정하기"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "깃 따라하기 안내서 (버전 1.5.1 이후)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "추천하는 깃 활용 작업 순서의 개요"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "자주 사용하는 깃 안내서는 다음과 같습니다:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 명령은 `%s' 명령의 단축입니다"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 명령은 '%s' 명령의 단축입니다"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "사용법: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "%s을(를) 열 수 없습니다"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "오브젝트 종류가 맞지 않습니다 (%s)"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "예상한 %s 오브젝트를 받지 않았습니다"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "%s 오브젝트: 예상한 종류 %s, 실제 %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "%d 바이트를 채울 수 없습니다"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "너무 빨리 파일이 끝남"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "입력에 읽기 오류"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "있는 바이트보다 더 많이 사용합니다"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "현재 정의된 off_t에 비해 묶음이 너무 큽니다"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "묶음 크기가 최대 허용 크기를 넘었습니다"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "'%s'을(를) 만들 수 없습니다"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "'%s' 묶음 파일을 열 수 없습니다"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "묶음 서명이 맞지 않습니다"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "묶음의 %<PRIu32> 버전을 지원하지 않습니다"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "묶음의 %<PRIuMAX> 오프셋에 잘못된 오브젝트가 있습니다: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "inflate가 %d번을 리턴했습니다"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "델타 베이스 오브젝트에 대해 오프셋 값이 오버플로우"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "델타 베이스 오프셋이 범위를 벗어났습니다"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "알 수 없는 오브젝트 종류 %d번"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "묶음 파일에 대해 pread를 할 수 없습니다"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "묶음 파일이 너무 일찍 끝남. %<PRIuMAX> 바이트 부족"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "심각한 inflate 부조화"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 충돌이 %s에서 발견되었습니다!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "기존 %s 오브젝트 정보를 읽을 수 없습니다"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "기존 %s 오브젝트를 읽을 수 없습니다"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "잘못된 블롭 오브젝트 %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "잘못된 %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "오브젝트에 오류"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s의 모든 하위 오브젝트에 접근할 수 없습니다"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "델타를 적용하는데 실패했습니다"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "오브젝트를 받는 중"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "오브젝트 인덱스를 만드는 중"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "묶음이 손상되었습니다 (SHA1 일치하지 않음)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "묶음 파일에 대해 fstat()할 수 없습니다"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "묶음의 끝에 쓰레기 데이터가 있습니다"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects()에서 극심한 혼란"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "델타를 알아내는 중"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "스레드를 만들 수 없습니다: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "극심한 혼란"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "로컬 오브젝트 %d개 마침"
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%s에 대해 예상치 못한 테일 체크섬 (디스크 손상?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "묶음에 알아내지 못한 델타 %d개가 있습니다"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "추가한 오브젝트를 deflate할 수 없습니다 (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "%s 로컬 오브젝트가 손상되었습니다"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "묶음 파일을 닫는데 오류"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "'%s' 보존 파일을 쓸 수 없습니다"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "쓴 '%s' 보존 파일을 닫지 못했습니다"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "묶음 파일을 저장할 수 없습니다"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "인덱스 파일을 저장할 수 없습니다"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "잘못된 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "기존 '%s' 묶음 파일을 열 수 없습니다"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "'%s'에 대한 기존 묶음 idx 파일을 열 수 없습니다"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "델타 아님: 오브젝트 %d개"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "체인 길이 = %d: 오브젝트 %lu개"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "'%s' 묶음파일 이름이 '.pack'으로 끝나지 않습니다"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
msgstr "잘못된 %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 옵션은 --stdin 옵션과 같이 쓸 수 없습니다"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
msgstr "--stdin 옵션은 깃 저장소가 필요합니다"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr "--verify 옵션에 묶음파일 이름을 지정하지 않았습니다"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <토큰>[(=|:)<"
"값>])...] [<파일>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "파일을 직접 편집합니다"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "빈 트레일러를 잘라냅니다"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "새 트레일러를 놓을 위치"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "트레일러가 이미 있을 때 동작"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "트레일러가 없을 때 동작"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "트레일러만 출력합니다"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "설정 규칙을 적용하지 않습니다"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "공백으로 계속된 값을 연결합니다"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "파싱 옵션 설정"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "트레일러"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "추가할 트레일러"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 옵션과 --only-input 옵션은 앞뒤가 맞지 않습니다"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "파일 직접 편집에 입력 파일을 지정하지 않았습니다"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<옵션>] [<리비전-범위>] [[--] <경로>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<옵션>] <오브젝트>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "잘못된 --decorate 옵션: %s"
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr "diff를 출력하지 않습니다"
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr "소스를 표시합니다"
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr "메일 맵 파일을 사용합니다"
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr "꾸미기 옵션"
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr "파일에서 n,m 범위의 줄을 처리합니다 (1부터 시작)"
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr "최종 출력: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 잘못된 파일"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr "%s 오브젝트를 읽을 수 없습니다"
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr "알 수 없는 종류: %d"
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr "format.headers 설정에 값이 없음"
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr "출력 디렉터리의 이름이 너무 깁니다"
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr "%s 패치 파일을 열 수 없습니다"
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr "정확히 하나의 범위가 필요합니다."
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr "범위가 아닙니다."
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr "커버레터는 전자메일 형식이어야 합니다"
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr "정신나간 in-reply-to 헤더: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<옵션>] [<시작시각> | <리비전-범위>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr "출력 디렉터리가 두개?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr "알 수 없는 커밋 %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다."
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr "정확한 병합 기준점을 찾을 수 없습니다."
-#: builtin/log.c:1284
+#: builtin/log.c:1288
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"아니면 직접 '--base=<기준점-커밋-ID>' 옵션으로 기준점 커밋을 지정할\n"
"수도 있습니다."
-#: builtin/log.c:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr "정확한 병합 기준점을 찾는데 실패했습니다"
-#: builtin/log.c:1315
+#: builtin/log.c:1319
msgid "base commit should be the ancestor of revision list"
msgstr "기준점 커밋은 리비전 목록의 상위 커밋이어야 합니다"
-#: builtin/log.c:1319
+#: builtin/log.c:1323
msgid "base commit shouldn't be in revision list"
msgstr "기준점 커밋은 리비전 목록에 들어 있으면 안 됩니다"
-#: builtin/log.c:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr "패치 ID를 알아낼 수 없습니다"
-#: builtin/log.c:1425
+#: builtin/log.c:1431
msgid "use [PATCH n/m] even with a single patch"
msgstr "하나의 패치에 대해서도 [PATCh n/m]을 붙입니다"
-#: builtin/log.c:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr "여러 개 패치에 대해서도 [PATCH]를 붙입니다"
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr "패치를 표준 출력으로 표시합니다"
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr "커버레터를 만듭니다"
-#: builtin/log.c:1436
+#: builtin/log.c:1442
msgid "use simple number sequence for output file names"
msgstr "출력 파일 이름에 간단한 일련 번호를 사용합니다"
-#: builtin/log.c:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr "확장자"
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' 대신 <확장자>를 사용합니다"
-#: builtin/log.c:1440
+#: builtin/log.c:1446
msgid "start numbering patches at <n> instead of 1"
msgstr "패치 번호를 1 대신 <n>에서 시작합니다"
-#: builtin/log.c:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr "시리즈를 N번째 re-roll로 표시합니다"
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[PATCH] 대신 [RFC PATCH]를 사용합니다"
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] 대신 [<접두어>]를 사용합니다"
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr "결과 파일을 <디렉터리>에 저장합니다"
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]를 자르거나 추가하지 않습니다"
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr "바이너리 diff를 만들지 않습니다"
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr "From 헤더에서 모두 0인 해시를 출력합니다"
-#: builtin/log.c:1460
+#: builtin/log.c:1466
msgid "don't include a patch matching a commit upstream"
msgstr "업스트림에 있는 패치를 포함하지 않습니다"
-#: builtin/log.c:1462
+#: builtin/log.c:1468
msgid "show patch format instead of default (patch + stat)"
msgstr "기본값 (패치 + 통계) 대신 패치 형식을 표시합니다"
-#: builtin/log.c:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr "메시징"
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr "헤더"
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
msgstr "전자메일 헤더"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr "전자메일"
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr "To: 헤더를 추가합니다"
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr "Cc: 헤더를 추가합니다"
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr "신원"
-#: builtin/log.c:1472
+#: builtin/log.c:1478
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "<신원>에서 From 주소를 설정합니다 (없으면 커미터 주소 신원 사용)"
-#: builtin/log.c:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr "메시지-ID"
-#: builtin/log.c:1475
+#: builtin/log.c:1481
msgid "make first mail a reply to <message-id>"
msgstr "첫 메일을 <메시지-ID>에 대한 답장 메일로 만듭니다"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr "경계"
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
msgstr "패치를 첨부합니다"
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr "패치를 본문에 포함합니다"
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr "메시지에 스레드를 사용, 스타일: shallow, deep"
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr "서명"
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr "서명을 추가합니다"
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr "베이스-커밋"
-#: builtin/log.c:1489
+#: builtin/log.c:1495
msgid "add prerequisite tree info to the patch series"
msgstr "전제조건 트리 정보를 패치 시리즈에 추가합니다"
-#: builtin/log.c:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr "파일에서 서명을 추가합니다"
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr "패치 파일 이름을 표시하지 않습니다"
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "패치를 만드는 동안 진행률을 표시합니다"
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr "잘못된 신원 줄: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr "-n 및 -k 옵션은 하나만 써야 합니다."
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc 및 -k 옵션은 하나만 써야 합니다."
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr "--name-only 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr "--name-status 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr "--check 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr "표준 출력이나 디렉터리 중에 하나만 지정해야 합니다."
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' 서명 파일을 읽을 수 없습니다"
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "패치 생성"
+
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr "출력 파일을 만드는데 실패했습니다"
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"추적되는 리모트 브랜치를 찾을 수 없습니다. <업스트림>을 수동으로 지정하십시"
"오.\n"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<옵션>] [<파일>...]"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr "파일 상태를 태그와 같이 표시합니다"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'변경되지 않았다고 가정' 파일에 소문자를 사용합니다"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
msgid "show cached files in the output (default)"
msgstr "출력에 캐시된 파일을 표시합니다 (기본값)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr "출력에 삭제된 파일을 표시합니다"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr "출력에 수정된 파일을 표시합니다"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr "출력에 기타 파일을 표시합니다"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr "출력에 무시된 파일을 표시합니다"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
msgid "show staged contents' object name in the output"
msgstr "출력에 커밋 표시된 내용의 오브젝트 이름을 표시합니다"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
msgid "show files on the filesystem that need to be removed"
msgstr "파일 시스템에서 제거해야 하는 파일을 표시합니다"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr "기타 디렉터리의 이름만 표시합니다"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr "파일의 줄 끝을 표시합니다"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr "빈 디렉터리 표시하지 않기"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr "출력에 병합하지 않은 파일을 표시합니다"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr "resolve-undo 정보를 표시합니다"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr "패턴에 일치하는 파일을 건너뜁니다"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr "제외할 패턴을 <파일>에서 읽습니다"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
msgstr "<파일>에서 추가적인 디렉터리별 제외 패턴을 읽습니다"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr "표준 깃 제외 패턴을 추가합니다"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
msgid "make the output relative to the project top directory"
msgstr "최상위 디렉터리 상대 경로로 출력합니다"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr "하위 모듈에 재귀적으로 적용"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "if any <file> is not in the index, treat this as an error"
msgstr "<파일>이 인덱스 안에 없으면 오류로 취급합니다"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr "트리-따위"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<트리-따위> 뒤로 제거한 경로가 있다고 가정합니다"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr "디버깅 데이터를 표시합니다"
msgid "empty mbox: '%s'"
msgstr "빈 mbox: '%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<옵션>] [<커밋>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "`m' 옵션에는 값이 필요합니다"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "'%s' 병합 전략을 찾을 수 없습니다.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "사용 가능한 전략은:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "사용 가능한 사용자 설정 전략은:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "병합이 끝날 때 diffstat을 표시하지 않습니다"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "병합이 끝날 때 diffstat을 표시합니다"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(--stat 옵션과 동일)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "병합 커밋의 메시지에 shortlog 항목을 (최대 <n>개) 추가합니다"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "병합하는 대신 하나의 커밋을 만듭니다"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "병합이 성공하면 커밋을 합니다 (기본값)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr "커밋 전에 메시지를 편집합니다"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "정방향 진행을 허용합니다 (기본값)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "정방향 진행이 불가능하면 중지합니다"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr "지정한 커밋에 올바른 GPG 서명이 있는지 검증합니다"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
#: builtin/revert.c:109
msgid "strategy"
msgstr "전략"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "사용할 병합 전략"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr "옵션=값"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "선택한 병합 전략에 대한 옵션"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "병합 커밋 메시지 (정방향이 아닌 병합에 대해)"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "현재 진행 중인 병합을 중지합니다"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "현재 진행 중인 병합을 계속합니다"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "관계 없는 커밋 내역의 병합을 허용합니다"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "커밋 메시지 후크를 검증합니다"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "stash를 실행할 수 없습니다."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "스태시 실패"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "올바른 오브젝트가 아닙니다: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree 실패"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (합칠 내용이 없습니다)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "커밋 합치기 -- HEAD를 업데이트하지 않습니다\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "병합 메시지가 없습니다 -- HEAD를 업데이트하지 않습니다\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s'이(가) 커밋을 가리키지 않습니다"
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "잘못된 branch.%s.mergeoptions 문자열: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:666
msgid "Not handling anything other than two heads merge."
msgstr "두 개의 헤드 병합 외에는 처리하지 않습니다."
-#: builtin/merge.c:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive에 대해 알 수 없는 옵션: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr "%s에 쓸 수 없습니다"
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
msgstr "'%s'에서 읽을 수 없습니다"
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"병합을 커밋하지 않습니다. 병합을 마치려면 'git commit'을 사용하십시오.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"'%c' 문자로 시작하는 줄은 무시되고, 메시지가 비어 있으면 커밋을\n"
"중지합니다.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr "빈 커밋 메시지."
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr "훌륭합니다.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "자동 병합이 실패했습니다. 충돌을 바로잡고 결과물을 커밋하십시오.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr "현재 브랜치가 없습니다."
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr "현재 브랜치에 대한 리모트가 없습니다."
-#: builtin/merge.c:893
+#: builtin/merge.c:914
msgid "No default upstream defined for the current branch."
msgstr "현재 브랜치에 대해 기본 업스트림을 지정하지 않았습니다."
-#: builtin/merge.c:898
+#: builtin/merge.c:919
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "리모트 %2$s에서 %1$s에 대한 리모트 추적 브랜치가 없습니다"
-#: builtin/merge.c:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "잘못된 값 '%s', 환경 '%s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "%s 안에서 병합할 수 있는 항목이 아닙니다: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr "병합할 수 있는 항목이 아닙니다"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr "--abort 옵션은 인자를 받지 않습니다"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "중지할 병합 작업이 없습니다. (MERGE_HEAD가 없음)"
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr "--continue 옵션은 인자를 받지 않습니다"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "진행 중인 병합 작업이 없습니다. (MERGE_HEAD가 없음)"
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"병합을 마치지 않았습니다. (MERGE_HEAD 있음)\n"
"병합하기 전에 변경 사항을 커밋하십시오."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있음)\n"
"병합하기 전에 변경 사항을 커밋하십시오."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있음)"
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash 옵션을 --no-ff 옵션과 같이 쓸 수 없습니다."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "커밋을 지정하지 않았고 merge.defaultToUpstream를 설정하지 않았습니다."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
msgid "Squash commit into empty head not supported yet"
msgstr "빈 헤드로 커밋을 합치기는 지원하지 않습니다"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "정방향이 아닌 커밋은 빈 헤드에서는 앞뒤가 맞지 않습니다"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 병합할 수 있는 항목이 아닙니다"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
msgid "Can merge only exactly one commit into empty head"
msgstr "빈 헤드에는 정확히 하나의 커밋만 병합할 수 있습니다"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "%s 커밋에 신뢰하지 않는 (서명자가 %s라고 하는) GPG 서명이 있습니다."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s 커밋에 잘못된 (서명자가 %s라고 하는) GPG 서명이 있습니다."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s 커밋에 GPG 서명이 없습니다."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s 커밋에 %s의 올바른 GPG 서명이 없습니다\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr "관계 없는 커밋 내역의 병합을 거부합니다"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr "이미 업데이트 상태입니다."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr "업데이트 중 %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "아주 간단한 인덱스 내부 병합을 시도합니다...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr "아님.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
msgstr "이미 업데이트 상태입니다. 야호!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr "정방향이 불가능하므로, 중지합니다."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "트리를 본래 위치로 되돌립니다...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "병합 전략 %s 시도...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "병합을 처리한 전략이 없습니다.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "전략 %s(으)로 병합이 실패했습니다.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "수동 해결의 준비를 위해 %s 전략을 사용합니다.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "자동 병합이 잘 진행되었습니다. 요청한대로 커밋 전에 중지합니다\n"
msgid "Directory %s is in index and no submodule?"
msgstr "%s 디렉터리가 인덱스에 있고 하위 모듈이 없습니다?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "계속하려면 .gitmodules의 변경 사항을 스테이지에 넣거나 스태시 하십시오"
msgid "skip move/rename errors"
msgstr "옮기기/이름 바꾸기 오류를 건너 뜁니다"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "대상이 ('%s') 디렉터리가 아닙니다"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "'%s'을(를) '%s'(으)로 이름 바꾸기합니다\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "잘못된 원본"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "디렉터리를 자기 자신으로 옮길 수 없습니다"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "디렉터리를 파일로 옮길 수 없습니다"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "원본 디렉터리가 비어 있습니다"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "버전 컨트롤 중이 아닙니다"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "대상이 있습니다"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "'%s' 덮어쓰기"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "덮어쓸 수 없습니다"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "동일한 대상에 대해 여러 개 원본"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "대상 디렉터리가 없습니다"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, 원본=%s, 대상=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "이름 바꾸기, '%s'에서 '%s'(으)로\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s'의 이름 바꾸기가 실패했습니다"
msgid "the note contents have been left in %s"
msgstr "노트 내용은 %s에 남습니다"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "'%s'을(를) 읽을 수 없습니다"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s'을(를) 열거나 읽을 수 없습니다"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다."
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "%s에서 노트를 %s 하기를 거부합니다 (refs/notes/ 밖임)"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "파라미터가 너무 많습니다"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "%s 오브젝트에 대해 노트가 없습니다."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "문자열로 노트 내용"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "파일 안에 노트 내용"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "지정한 노트 오브젝트를 재사용하고 편집합니다"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "지정한 노트 오브젝트를 재사용합니다"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "빈 노트 저장을 허용합니다"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "기존 노트를 바꿉니다"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"노트를 추가할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트"
"를 덮어쓰려면 '-f' 옵션을 사용하십시오"
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "%s 오브젝트에 대한 기존 노트를 덮어씁니다\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s 오브젝트에 대한 노트를 제거합니다\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "표준 입력에서 오브젝트를 읽습니다"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "<명령>에 대한 다시쓰기 설정을 읽어들입니다 (--stdin 옵션 포함)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "파라미터가 너무 적습니다"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"노트를 복사할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트"
"를 덮어쓰려면 '-f' 옵션을 사용하십시오"
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "원본 %s 오브젝트에 대한 노트가 없습니다. 복사할 수 없습니다."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"-m/-F/-c/-C 옵션은 'edit' 하위 명령에 대해 사용을 권하지 않습니다.\n"
"대신에 'git notes add -f -m/-F/-c/-C' 명령을 사용하십시오.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL 레퍼런스 삭제에 실패했습니다"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF 레퍼런스 삭제에 실패했습니다"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "'git notes merge' 작업트리 제거에 실패했습니다"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL 레퍼런스 읽기에 실패했습니다"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "NOTES_MERGE_PARTIAL에서 커밋을 찾을 수 없습니다."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "NOTES_MERGE_PARTIAL에서 커밋을 파싱할 수 없습니다."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF 알아내기에 실패했습니다"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "노트 병합을 마치는데 실패했습니다"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "알 수 없는 노트 병합 전략 %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "일반 옵션"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "병합 옵션"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"주어진 전략을 사용해 노트 충돌을 해결합니다 (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "병합하지 않은 노트 커밋"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "병합하지 않은 노트를 커밋해 노트 병합을 마칩니다"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "노트 병합 해결 중지"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "노트 병합을 중지합니다"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort, -s/--strategy 옵션을 섞어 쓸 수 없습니다"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "병합할 노트 레퍼런스를 지정해야 합니다"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "알 수 없는 전략(-s/--strategy): %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "%s 위치로 노트 병합이 이미 %s에서 진행중입니다"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "현재 노트 레퍼런스의 (%s) 링크를 저장하는데 실패했습니다."
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"merge --commit' 명령으로 커밋하십시오. 또는 'git notes merge --abort' 명령으"
"로 병합을 중지하십시오.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "%s 오브젝트에 노트가 없습니다\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "없는 노트를 제거하려는 시도를 오류가 아닌 것으로 취급합니다"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "표준 입력에서 오브젝트 이름을 읽습니다"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "제거하지 않고, 보여주기만 합니다"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "잘라낸 노트를 알립니다"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "노트-레퍼런스"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "<노트-레퍼런스>에서 노트를 사용합니다"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<옵션>...] [< <레퍼런스목록> | < <오브젝트목록>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<옵션>...] <베이스이름> [< <레퍼런스목록> | < <오브젝트목록"
">]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr "deflate 오류 (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"배트맵 쓰기를 하지 않습니다. 묶음은 pack.packSizeLimit 값에 따라 쪼개집니다"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr "오브젝트 쓰는 중"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "묶음에 들어있지 않은 오브젝트가 있으므로, 비트맵 쓰기를 하지 않습니다"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr "오브젝트 압축하는 중"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr "지원하지 않는 인덱스 버전 %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
msgstr "잘못된 인덱스 버전 '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr "진행률을 표시하지 않습니다"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr "진행률을 표시합니다"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
msgid "show progress meter during object writing phase"
msgstr "오브젝트 쓰기 단계에서 진행률을 표시합니다"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
msgid "similar to --all-progress when progress meter is shown"
msgstr "진행률이 표시될 때 --all-progress와 비슷합니다"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr "버전[,오프셋]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
msgid "write the pack index file in the specified idx format version"
msgstr "지정한 버전의 인덱스 형식에 따라 묶음 인덱스 파일을 씁니다"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr "출력 묶음 파일의 최대 크기"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr "보조 오브젝트 저장소에서 빌려온 오브젝트를 무시합니다"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr "묶음 오브젝트를 무시합니다"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr "묶음 윈도우를 오브젝트 단위로 제한합니다"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
msgid "limit pack window by memory in addition to object limit"
msgstr "묶음 윈도우를 오브젝트 단위에 추가로 메모리 단위로 제한합니다"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "결과물 묶음에서 허용되는 최대 길이의 델타 체인"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr "기존 델타를 재사용합니다"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr "기존 오브젝트를 재사용합니다"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA 오브젝트를 사용합니다"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
msgid "use threads when searching for best delta matches"
msgstr "최상의 델타 일치를 검색하는데 스레드를 사용합니다"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr "빈 묶음 출력을 만들지 않습니다"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr "표준 입력에서 리비전 인자를 읽습니다"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
msgid "limit the objects to those that are not yet packed"
msgstr "묶지 않는 오브젝트 수를 제한합니다"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr "모든 레퍼런스에서 접근 가능한 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
msgid "include objects referred by reflog entries"
msgstr "reflog 항목에서 레퍼런스할 수 있는 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr "인덱스에서< 레퍼런스하는 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr "묶음을 표준 출력으로 출력합니다"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
msgid "include tag objects that refer to objects to be packed"
msgstr "묶음에 들어갈 오브젝트를 레퍼런스하는 태그 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr "접근 불가능 오브젝트를 보존합니다"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr "느슨한 접근 불가능 오브젝트를 묶습니다"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr "<시각>보다 새로운 접근 불가능 오브젝트의 묶음을 풉니다"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr "얇은 묶음을 만듭니다"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr "얕은 가져오기에 적합한 묶음을 만듭니다"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr "해당하는 .keep 파일이 있는 묶음을 무시합니다"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr "묶음 압축 단계"
# FIXME: graft?
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr "붙어 있는 커밋을 숨기지 않습니다"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
msgid "use a bitmap index if available to speed up counting objects"
msgstr "가능하면 비트맵 인덱스를 사용해 오브젝트 세기 속도를 높입니다"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
msgid "write a bitmap index together with the pack index"
msgstr "묶음 인덱스와 같이 비트맵 인덱스를 씁니다"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr "오브젝트 개수 세는 중"
msgid "prune loose refs (default)"
msgstr "느슨한 레퍼런스를 잘라냅니다 (기본값)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "중복된 오브젝트 제거"
msgid "incorporate changes by rebasing rather than merging"
msgstr "변경 사항을 적용할 때 병합하는 대신 리베이스합니다"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "정방향 진행을 허용합니다"
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff에 대해 잘못된 값: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:403
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "가져온 레퍼런스 중에 리베이스할 대상 후보가 없습니다."
-#: builtin/pull.c:401
+#: builtin/pull.c:405
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "가져온 레퍼런스 중에 병합할 대상 후보가 없습니다."
-#: builtin/pull.c:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"보통 이런 경우는 리모트 쪽에는 없는 와일드카드 레퍼런스명세가\n"
"주어졌을 때 일어납니다."
-#: builtin/pull.c:405
+#: builtin/pull.c:409
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"이 리모트는 현재 브랜치에 대해 기본으로 설정된 리모트가\n"
"아니기 때문에, 명령행에서 브랜치를 지정해야 합니다."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "현재 어떤 브랜치 위에도 있지 않습니다."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "어떤 브랜치를 대상으로 리베이스할지 지정하십시오."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "어떤 브랜치를 대상으로 병합할지 지정하십시오."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr "자세한 정보는 git-pull(1) 페이지를 참고하십시오."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<리모트>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<브랜치>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "현재 브랜치에 추적 정보가 없습니다."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:438 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:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"설정에서 리모트의 '%s' 레퍼런스와 병합하도록 지정했지만,\n"
"그런 레퍼런스를 가져오지 않았습니다."
-#: builtin/pull.c:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr "리베이스에 대해 --verify-signatures 옵션을 무시합니다"
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 옵션은 --rebase 옵션과 같이 써야 합니다."
-#: builtin/pull.c:848
+#: builtin/pull.c:852
msgid "Updating an unborn branch with changes added to the index."
msgstr "만들어지지 않은 브랜치를 인덱스에 추가된 변경 사항으로 업데이트합니다."
-#: builtin/pull.c:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr "리베이스로 풀하기"
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
msgstr "커밋하거나 스태시에 넣으십시오."
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"작업 폴더를 %s 커밋에서 정방향\n"
"진행합니다."
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"복구됩니다."
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr "여러 브랜치로 리베이스할 수 없습니다."
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "로컬에서 기록한 하위 모듈 수정 사항을 이용해 리베이스할 수 없습니다"
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<옵션>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "빈 커밋을 유지합니다"
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr "리베이스 계속"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr "리베이스를 중지합니다"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "리베이스 스크립트를 만듭니다"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "할 일 목록의 SHA-1을 줄입니다"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "할 일 목록의 SHA-1을 늘입니다"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "할 일 목록을 확인합니다"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "불필요한 빼오기를 건너뜁니다"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash 줄 재구성"
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"이 메시지를 보지 않고 기본 동작을 계속 하려면,\n"
"'receive.denyCurrentBranch' 설정 변수를 'refuse'로 설정하십시오."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"이 메시지를 보지 않으려면, 이 설정 변수를 'refuse'로 설정하십시오."
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr "출력 않기"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr "디렉터리를 지정해야 합니다."
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "마스터 브랜치를 지정은 fetch 미러에서만 앞뒤가 맞습니다"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "%s 리모트가 이미 있습니다."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s'은(는) 올바른 리모트 이름이 아닙니다"
msgid "(delete)"
msgstr "(삭제)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "그런 리모트가 없습니다: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "설정 섹션을 '%s'에서 '%s'(으)로 바꿀 수 없습니다"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\t필요하면 설정을 수동으로 업데이트하십시오."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "'%s' 삭제가 실패했습니다"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "'%s' 만들기가 실패했습니다"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"다.\n"
"삭제하려면 다음을 사용하십시오:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "설정 섹션 '%s'을(를) 제거할 수 없습니다"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 새 항목 (다음 가져오기는 remotes/%s 아래 저장됩니다)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " 추적됨"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " 오래됨 (제거하려면 'git remote prune'을 사용하십시오)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "잘못된 branch.%s.merge 값. 여러 개 브랜치로 리베이스할 수 없습니다"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "리모트 %s 위로 대화식으로 리베이스합니다"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "리모트 %s 위로 리베이스합니다"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " 병합: 리모트 %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "병합: 리모트 %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 그리고 리모트 %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "만들기"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "삭제"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "최신 상태"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "정방향 진행 가능"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "로컬이 뒤떨어짐"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s에서 %-*s(으)로 강제 (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s에서 %-*s(으)로 푸시 (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s에서 %s(으)로 강제"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s에서 %s(으)로 푸시"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "리모트에 질의하지 않습니다"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* 리모트 %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " 가져오기 URL: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(URL 없음)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " 푸시 URL: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 브랜치: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(질의하지 않음)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(알 수 없음)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 브랜치 (리모트 HEAD는 애매하고, 다음 중 하나일 수 있습니다):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 리모트 브랜치:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (상태를 질의하지 않음)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull'에 사용할 로컬 브랜치를 설정:"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " 로컬 레퍼런스를 'git push'로 미러링할 예정"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 로컬 레퍼런스를 'git push'로 미러링%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "레퍼런스/리모트/<이름>/HEAD 값을 리모트에 맞게 설정합니다"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "레퍼런스/리모트/<이름>/HEAD 값을 삭제합니다"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "리모트 HEAD를 결정할 수 없습니다"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"리모트 HEAD 브랜치가 여러개입니다. 다음 중 하나를 명시적으로 지정하십시오:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "%s을(를) 삭제할 수 없습니다"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "올바른 레퍼런스가 아닙니다: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "%s을(를) 설정할 수 없습니다"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s의 연결이 끊어집니다!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s의 연결이 끊어졌습니다!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "잘라냄: %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [잘라낼 예정] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [잘라냄] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "가져온 후에 리모트를 잘라냅니다"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "그런 리모트가 없습니다 ('%s')"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "브랜치를 추가합니다"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "리모트를 지정하지 않았습니다"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "가져오기 URL이 아니라 푸시 URL을 질의합니다"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "모든 URL을 리턴합니다"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' 리모트에 대한 URL을 설정하지 않았습니다"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "푸시 URL을 지정합니다"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "URL을 추가합니다"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "URL을 삭제합니다"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 옵션을 둘다 쓰면 안 됩니다"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "잘못된 오래전 URL 패턴: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "그런 URL이 없습니다: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "푸시용이 아닌 모든 URL을 삭제하지 않습니다"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "자세히 표시합니다 (하위 명령 앞에 와야 합니다)"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 및 -A 옵션은 호환되지 않습니다"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
msgstr "'%s' 제거에 실패했습니다"
msgid "keep"
msgstr "유지"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "올바른 HEAD가 없습니다."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "HEAD의 트리를 찾는데 실패했습니다."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "%s의 트리를 찾는데 실패했습니다."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD의 현재 위치는 %s입니다"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "병합 중에 %s 리셋을 할 수 없습니다."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "간략히 표시, 오류만 표시합니다"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "HEAD와 인덱스를 리셋합니다"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "HEAD만 리셋합니다"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "HEAD, 인덱스, 작업폴더를 리셋합니다"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "HEAD를 리셋하지만 로컬 변경 사항을 남겨둡니다"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr "제거한 경로를 나중에 추가한다는 사실만 기록합니다"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "'%s'을(를) 올바른 리비전으로 찾는데 실패했습니다."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "'%s'을(를) 올바른 트리로 찾는데 실패했습니다."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 옵션은 --{hard,mixed,soft} 옵션과 호환되지 않습니다"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed 옵션을 경로와 같이 쓰기는 제거될 예정입니다. 대신에 'git reset -- <경"
"로>'를 사용하십시오."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "경로와 같이 %s 리셋을 할 수 없습니다."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s 리셋은 간략한 저장소에서만 쓸 수 있습니다"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N 옵션은 --mixed 옵션과 같이 써야만 합니다"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "리셋 뒤에 스테이징하지 않은 변경 사항:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "인덱스 파일을 '%s' 리비전으로 리셋할 수 없습니다."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "새 인덱스 파일을 쓸 수 없습니다."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr "rev-list는 노트 표시를 지원하지 않습니다"
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<옵션>] -- [<인자>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "인자로 넘긴 `--`를 유지합니다"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "첫번째 옵션이 아닌 인자 뒤에 파싱을 중지합니다"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "stuck long 형식으로 출력합니다"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "keep redundant, empty commits"
msgstr "여분의 빈 커밋을 유지합니다"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "되돌리기 실패"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "cherry-pick 실패"
msgid "exit with a zero status even if nothing matched"
msgstr "아무 것도 일치하지 않으면 상태 0번으로 끝납니다"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "-r 옵션이 없으면 재귀적으로 '%s'을(를) 제거하지 않습니다"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: %s을(를) 제거할 수 없습니다"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "'%s'을(를) 제거할 수 없습니다"
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<옵션>] [<리비전-범위>] [[--] [<경로>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "작성자가 아닌 커미터로 묶습니다"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "작성자별 커밋 수에 따라 정렬합니다"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "커밋 설명을 생략하고, 커밋 수만 표시합니다"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "작성자의 전자메일 주소를 표시합니다"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "줄바꿈 출력"
msgid "prepend comment character and space to each line"
msgstr "각 줄의 앞에 주석 문자와 공백을 붙입니다"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr "그런 레퍼런스가 없습니다: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "'%s' URL 하나의 단계를 잘라낼 수 없습니다"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr "상대 경로에 사용할 또다른 기준"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ".gitmodules에서 하위 모듈 경로 '%s'에 대한 URL이 없습니다"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
msgstr ""
"'%s' 설정을 찾아볼 수 없습니다. 이 저장소가 자체 업스트림이라고 가정합니다."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "하위 모듈 경로 '%s'에 대한 URL을 등록하는데 실패했습니다"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "'%3$s' 경로에 대해 '%1$s' (%2$s) 하위 모듈 등록\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "경고: '%s' 하위 모듈에 대해 커맨드 업데이트 모드가 제안되었습니다\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "'%s' 하위 모듈에 대해 업데이트 모드 등록이 실패했습니다"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr "하위 모듈 초기화에 출력을 하지 않습니다"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<경로>]"
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <경로>"
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "경로 '%s'에 대해 .gitmodules에 있는 하위모듈 매핑이 없습니다"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "'%s' 하위 모듈에 보조 오브젝트를 추가할 수 없습니다: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "submodule.alternateErrorStrategy에 대한 값이('%s') 알 수 없는 값입니다"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "submodule.alternateLocation에 대한 값이('%s') 알 수 없는 값입니다"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr "새 하위 모듈을 복제할 대상 위치"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr "새 하위 모듈 이름"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr "하위 모듈을 복제해 올 URL"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr "얕은 복제에 사용할 깊이"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr "복제 진행 상황을 항상 표시합니다"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
">] [--name <이름>] [--depth <깊이>] --url <url> --path <경로>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s'에서 하위 모듈 경로 '%s'에 복제하는데 실패했습니다"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s'에 대한 하위 모듈 디렉터리를 가져올 수 없습니다"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "'%s' 하위 모듈 경로가 초기화되지 않았습니다"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init'을 하려고 한 것 아니었습니까?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "병합하지 하위 모듈 %s 건너뜀"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
msgstr "하위 모듈 '%s' 건너뜀"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' 복제하는데 실패했습니다. 재시도 예정"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "두번째 '%s' 복제하는데 실패했습니다. 중지합니다"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr "작업 폴더로 가는 경로"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
msgid "path into the working tree, across nested submodule boundaries"
msgstr "작업 폴더로 가는 경로, 내장된 하위 모듈의 경계 통과"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout 또는 none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "지정한 개수의 리비전에서 잘린 얕은 복제를 만듭니다"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr "병렬 작업 개수"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "최초 복제가 얕은 복제 추천을 따를지 여부"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr "복제 과정을 표시하지 않습니다"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
msgstr "파라미터 업데이트에 값이 잘못되었습니다"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 "
"프로젝트에 브랜치가 없습니다"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr "하위 모듈에 재귀적으로 적용"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<경로>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s에서 --super-prefix 옵션을 지원하지 않습니다"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다"
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <이름>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "심볼이 아닌 (분리된) 레퍼런스에 대해 에러 메시지를 표시하지 않습니다"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "심볼릭 레퍼런스를 삭제합니다"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "레퍼런스 출력을 줄입니다"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "이유"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "업데이트의 이유"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<형식>] <태그이름>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "'%s' 태그가 없습니다."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "'%s' 태그 삭제함 (과거 %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
" %s\n"
"'%c' 문자로 시작하는 줄은 무시됩니다.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"'%c' 문자로 시작하는 줄은 유지됩니다. 제거하려면 직접 지워야 합니다.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "태그에 서명할 수 없습니다"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "태그 파일을 쓸 수 없습니다"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "잘못된 오브젝트 종류."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "태그 메시지 없음?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "태그 메시지가 %s 파일에 남아 있습니다\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "태그 이름 목록을 표시합니다"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "각 태그 메시지의 <n>줄을 표시합니다"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "태그를 삭제합니다"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "태그를 검증합니다"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "태그 만들기 옵션"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "주석 달린 태그, 메시지가 필요합니다"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "태그 메시지"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "주석 달리고 GPG 서명한 태그"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "태그를 서명하는데 지정한 키를 사용합니다"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "태그가 있으면 바꿉니다"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "reflog를 만듭니다"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "태그 목록 보기 옵션"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "태그 목록을 여러 열로 표시합니다"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "해당 커밋이 들어 있는 태그만 표시합니다"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "해당 커밋이 들어 있지 않은 태그만 표시합니다"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "병합된 태그만 표시합니다"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "병합되지 않은 태그만 표시합니다"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "해당 오브젝트의 태그만 표시합니다"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column 및 -n 옵션은 호환되지 않습니다"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "-n 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "--contains 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 및 --no-merged 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "하나의 -F 또는 -m 옵션만 쓸 수 있습니다."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "파라미터가 너무 많습니다"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s'은(는) 올바른 태그 이름이 아닙니다."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "태그 '%s'이(가) 이미 있습니다"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "태그 '%s' 업데이트 (과거 %s)\n"
msgid " OK"
msgstr " 오케이"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<옵션>] [--] [<파일>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr "인덱스에 업데이트가 필요하더라도 새로 고침을 계속합니다"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr "새로 고침: 하위 모듈 무시"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr "새 파일을 무시할 수 않습니다"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr "디렉터리를 파일로, 또는 그 반대로 바꿀 수 있게 허용합니다"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr "작업폴더에서 알림 파일이 없습니다"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr "인덱스에 병합하지 않은 항목이 있어도 새로 고칩니다"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr "파일 정보를 새로 고칩니다"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "--refresh와 동일하지만, assume-unchanged 설정을 무시합니다"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr "<모드>,<오브젝트>,<경로>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr "지정한 항목을 인덱스에 추가합니다"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr "파일을 \"바꾸지 않음\"으로 표시합니다"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr "바꾸지 않음으로 가정 (assumed-unchanged) 비트를 지웁니다"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr "파일을 인덱스 전용으로 (\"index-only\") 표시합니다"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr "작업폴더 건너뛰기 (skip-worktree) 비트를 지웁니다"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
msgid "add to index only; do not add content to object database"
msgstr ""
"인덱스에만 추가합니다. 내용을 오브젝트 데이터베이스에 추가하지 않습니다"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
msgid "remove named paths even if present in worktree"
msgstr "작업 폴더에 있어도 해당 경로를 제거합니다"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "--stdin과 같이 사용: 입력 줄은 NUL 바이트로 끝납니다"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
msgid "read list of paths to be updated from standard input"
msgstr "표준 입력에서 업데이트할 경로의 목록을 읽습니다"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
msgid "add entries from standard input to the index"
msgstr "표준 입력에서 읽은 항목을 인덱스에 추가합니다"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "경로 목록에 대해 #2 및 #3 스테이징을 다시 합니다"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr "HEAD와 다른 항목만 업데이트합니다"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr "작업 폴더에 없는 파일을 무시합니다"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr "표준 출력에 동작을 알립니다"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "저장한 해결되지 않은 충돌을 무시합니다 (사용자용 명령 용도)"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr "인덱스를 이 형식으로 씁니다"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr "스플릿 인덱스를 켜거나 끕니다"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr "추적하지 않는 캐시 사용을 켜거나 끕니다"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
msgid "test if the filesystem supports untracked cache"
msgstr "파일 시스템이 추적하지 않는 캐시를 지원하는지 검사합니다"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "enable untracked cache without testing the filesystem"
msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합니다"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
"core.splitIndex 값이 거짓입니다. 정말로 스플릿 인덱스를 사용하려면 이 값을 제"
"거하거나 바꾸십시오."
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
"core.splitIndex 값이 참입니다. 정말로 스플릿 인덱스를 사용하지 않으려면 이 값"
"을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache 값이 참입니다. 정말로 추적하지 않는 캐시를 사용하지 않으"
"려면 이 값을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache 값이 거짓입니다. 정말로 추적하지 않는 캐시를 사용하려면 "
"이 값을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "'%s'에 대해 추적되지 않는 캐시를 사용하지 않습니다"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<옵션>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "레퍼런스를 삭제합니다"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "<레퍼런스이름>을 가리키지 않는 항목으로 업데이트합니다"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "표준 입력에 NUL로 끝나는 인자가 있습니다"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "표준 입력에서 업데이트를 읽습니다"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <경로>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "worktrees/%s 제거: gitdir 파일이 없습니다"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "worktrees/%s 제거: gitdir 파일을 읽을 수 없습니다 (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "작업 트리 제거/%s: 부족하게 읽음 (%<PRIuMAX> 바이트 예상, %<PRIuMAX> 바이트 읽음)"
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "worktrees/%s 제거: gitdir 파일이 올바르지 않습니다"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "worktrees/%s 제거: gitdir 파일이 없는 위치를 가리킵니다"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "잘라낸 작업 폴더를 알립니다"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "<시각>보다 오래 된 작업 폴더를 만료합니다"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
msgstr "'%s'이(가) 이미 있습니다"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s'의 디렉터리를 만들 수 없습니다"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "%s 준비 중 (ID %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "다른 작업 폴더에서 체크아웃했더라도 <브랜치>를 체크아웃합니다"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr "새 브랜치를 만듭니다"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr "브랜치를 만들거나 리셋합니다"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr "새 작업 폴더를 만듭니다"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr "새 작업 폴더를 잠궈 둡니다"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr "잠그는 이유"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s'은(는) 작업 폴더가 아닙니다"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
msgid "The main working tree cannot be locked or unlocked"
msgstr "메인 작업 폴더를 잠그거나 잠금 해제할 수 없습니다"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s'은(는) 이미 잠겼습니다. 이유: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
msgstr "'%s'은(는) 이미 잠겼습니다"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
msgstr "'%s'은(는) 잠기지 않았습니다"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<옵션>] <디렉터리>"
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "하나의 요청/응답 교환 뒤에 끝납니다"
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "최초 레퍼런스 알림 뒤에 즉시 끝납니다"
-#: upload-pack.c:1045
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ 폴더를 시도하지 않습니다."
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "<n>초 동안 반응이 없으면 전송을 중지합니다"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "디버깅 메시지를 표준오류로 출력합니다"
"목록을 볼 수 있습니다. 특정 하위 명령어나 개념에 대해 읽어 보려면 'git help\n"
"<명령>' 또는 'git help <개념>' 명령을 실행하십시오."
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer이 0보다 작은 값입니다. 기본값 %d"
# HTTP delegation
-#: http.c:358
+#: http.c:359
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "딜리게이션 컨트롤은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다"
-#: http.c:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "공개 키 고정은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다"
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "이미 $pretty_name에 업데이트 상태입니다"
#: git-merge-octopus.sh:89
#: git-rebase.sh:58
msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"이 문제를 해결하면, \"\"git rebase --continue\"를 실행하십시오.\n"
-"이 패치를 건너뛰려면, 대신에 \"git rebase --skip\"을 실행하십시오.\n"
-"원래 브랜치를 체크아웃하고 리베이스를 중지하려면, \"git rebase --abort\"를 실"
-"행하십시오."
+"모든 충돌을 수동으로 해결하고, 모두 \"git add/rm <충돌_파일>\" 명령으로\n"
+"해결했다고 표시하고, \"git rebase --continue\" 명령을 실행하십시오. 이 패치를\n"
+"건너뛰려면, 대신에 \"git rebase --skip\" 명령을 실행하십시오. 리베이스를\n"
+"중지하고 \"git rebase\" 명령 전의 원래 상태로 돌아가려면, \"git rebase --abort\"\n"
+"명령을 실행하십시오."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "'$head_name' 위치로 돌아갈 수 없습니다"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "자동스태시 적용."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "\"$stash_sha1\"을(를) 저장할 수 없습니다"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "리베이스 전 후크에서 리베이스를 거부했습니다."
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "git-am이 진행 중인 것처럼 보입니다. 리베이스할 수 없습니다."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "리베이스가 진행 중이지 않습니다"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "--edit-todo 동작은 대화형 리베이스에서만 사용할 수 있습니다."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "HEAD를 읽을 수 없습니다"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"모든 병합 충돌을 편집하고 git add\n"
"명령으로 해결되었다고 표시해야 합니다"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"이 명령을 다시 실행하십시오. 중요한 사항이 남아 있을 경우를\n"
"대비해 여기서 멈춥니다."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "잘못된 업스트림 $upstream_name"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 여러 개의 병합 베이스가 있습니다"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 병합 베이스가 없습니다"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "올바른 커밋을 가리키지 않습니다: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "치명적 이상: 그런 브랜치가 없습니다: $branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr "자동 스태시를 할 수 없습니다"
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "자동 스태시를 만들었습니다: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
msgstr "커밋하거나 스태시에 넣으십시오."
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다."
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다. 강제 리베이스합니다."
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "변경 사항 '$mb'에서 '$onto'(으)로:"
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
msgstr "작업 사항을 다시 넣기 위해 먼저 헤드를 뒤로 돌립니다..."
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 명령을 파라미터와 같이 쓰기는 구현되지 않았습니다"
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr "아직 최초 커밋이 없습니다"
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr "현재 인덱스 상태를 저장할 수 없습니다"
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
msgstr "추적하지 않는 파일을 저장할 수 없습니다"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr "현재 작업 폴더 상태를 저장할 수 없습니다"
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr "변경 사항을 선택하지 않았습니다"
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr "임시 인덱스를 제거할 수 없습니다 (일어날 수 없는 상황)"
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr "작업 폴더 상태를 기록할 수 없습니다"
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "$ref_stash을(를) $w_commit(으)로 업데이트할 수 없습니다"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"오류: 'stash save'에 대해 알 수 없는 옵션: $option\n"
" 메시지를 넘기려면, 다음과 같이 쓰십시오: git stash save -- '$option'"
-#: git-stash.sh:281
+#: git-stash.sh:288
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
-#: git-stash.sh:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr "저장할 로컬 변경 사항이 없습니다"
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr "스태시를 초기화할 수 없습니다"
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr "현재 상태를 저장할 수 없습니다"
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "작업 폴더와 $stash_msg 인덱스 상태를 저장했습니다"
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr "작업폴더 변경 사항을 제거할 수 없습니다"
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr "알 수 없는 옵션: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:495
msgid "No stash entries found."
msgstr "스태시 항목이 없습니다."
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "너무 많은 리비전을 지정했습니다: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference은(는) 올바른 레퍼런스가 아닙니다"
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args'은(는) 스태시 커밋이 아닙니다"
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args'은(는) 스태시 레퍼런스가 아닙니다"
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr "인덱스를 새로 고칠 수 없습니다"
-#: git-stash.sh:560
+#: git-stash.sh:568
msgid "Cannot apply a stash in the middle of a merge"
msgstr "병합 도중에 스태시를 적용할 수 없습니다"
-#: git-stash.sh:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr "인덱스에 충돌. --index 없이 시도해 보십시오."
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr "인덱스 트리를 저장할 수 없습니다"
-#: git-stash.sh:579
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
msgstr "스태시 항목에서 추적하지 않는 파일을 복구할 수 없습니다"
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr "수정한 파일을 스테이지에서 뺄 수 없습니다"
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr "인덱스가 스태시에서 빠졌습니다."
-#: git-stash.sh:633
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
msgstr "다시 필요할 때를 대비해 스태시 항목을 보관합니다."
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} 지움 ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: 스태시 항목을 지울 수 없습니다"
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr "브랜치 이름을 지정하지 않았습니다"
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
msgstr ""
"'$name' 하위 모듈이 ($url) '$displaypath' 경로에 대해 등록되지 않았습니다"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "하위 모듈 경로에서 ('$displaypath') 현재 리비전을 찾을 수 없습니다"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "하위 모듈 경로 '$sm_path'에서 가져올 수 없습니다"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 "
"없습니다"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 가져올 수 없습니다"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니"
"다. 이 커밋을 직접 가져오는데 실패했습니다."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 체크아웃할 수 없습니다"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체크아웃"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 리베이스할 수 없습니다"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베이스"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1' 병합할 수 없습니다"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'에서 병합"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "'$command $sha1' 실행이 하위 모듈 경로 '$displaypath'에서 실패했습니다"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "재귀적으로 하위 모듈 경로 '$displaypath'에 들어가는데 실패했습니다"
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "--cached 옵션은 --files 옵션과 같이 쓸 수 없습니다"
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "예상치 못한 모드 $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 경고: '$display_name'에 '$sha1_src' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 경고: '$display_name'에 '$sha1_dst' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, 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:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다"
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화"
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
msgid "Refusing to squash a merge: $sha1"
msgstr "병합 squash 거부: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "$sha1 병합을 다시 하는데 오류"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "$sha1을 빼오기 할 수 없습니다"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "커밋 메시지 #${n}번입니다:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "#${n}번째 커밋 메시지를 건너뜁니다:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "커밋 $count개가 섞인 결과입니다."
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "$fixup_msg를 쓸 수 없습니다"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "커밋 2개가 섞인 결과입니다."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "다음을 적용할(apply) 수 없습니다: $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"대부분의 경우 빈 커밋 메시지 때문이거나, 또는 커밋 전 후크가 실패했기\n"
"때문입니다. 커밋 메시지를 수정하기 전에 이 문제를 먼저 해결해야 합니다."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "다음에서 멈춥니다: $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "이전 커밋 없이 '$squash_style' 수행할 수 없습니다"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "실행 중: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "실행 실패: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "알 수 없는 명령: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "성공적으로 리베이스했고 $head_name 업데이트했습니다."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "불필요한 빼오기 명령을 건너뛸 수 없습니다"
-
-#: git-rebase--interactive.sh:908
-#, 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:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"경고: 다음 줄에서 명령어가 무엇인지 알 수 없습니다:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr "HEAD는 분리할 수 없습니다"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n"
-"버려진 커밋 (최근에서 과거 순서):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시"
-"오.\n"
-"\n"
-"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니"
-"다.\n"
-"가능한 동작은: ignore, warn, error"
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시"
-"합니다."
-
-#: git-rebase--interactive.sh:1054
-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:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "아니면 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
msgid "Error trying to find the author identity to amend commit"
msgstr "커밋을 수정한 작성자 신원을 찾는데 오류"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n"
"커밋하고 'git rebase --continue' 명령을 다시 실행하십시오."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
msgstr "스테이징한 변경 사항은 커밋할 수 없습니다."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr "편집기를 실행할 수 없습니다"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "$switch_to를 체크아웃할 수 없습니다"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr "HEAD가 없습니다?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr "대화형으로 표시할 수 없습니다."
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
msgstr "다시 작성된 커밋을 초기화할 수 없습니다"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "리베이스 $shortrevisions, $shortonto 위로 (명령 $todocount개)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"하지만 모두 제거할 경우, 리베이스를 중지합니다.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr "단 빈 커밋은 주석 처리되었습니다."
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "지역 시각 오프셋이 24시간보다 크거나 작습니다\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "편집기가 비정상적으로 끝나서, 모두 중지합니다"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 안에 작성 중이었던 중간 버전의 전자메일이 들어 있습니다.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 안에 작성한 전자메일이 들어 있습니다.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 옵션은 다른 옵션과 호환되지 않습니다\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "저장소 밖에서 git format-patch 명령을 실행할 수 없습니다\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "알 수 없는 --suppress-cc 필드: '%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "알 수 없는 --confirm 설정: '%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "경고: 따옴표가 있는 sendmail 별칭은 지원하지 않습니다: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "경고: `:include:`는 지원하지 않습니다: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "경고: `/file` 또는 `|pipe` 리다이렉션은 지원하지 않습니다: %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "경고: sendmail 줄이 인식되지 않습니다: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 파일을 의도했다면 \"./%s\"(이)라고 쓰고, 아니면\n"
" * 범위를 의도했다면 --format-patch 옵션 사용\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "%s에 opendir 실패: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"치명적 오류: %s: %s\n"
"경고: 패치를 보내지 않았습니다\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"패치 파일을 지정하지 않았습니다\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "%s 안에 제목 줄이 없습니다?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "%s에 쓰려고 여는데 실패: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"요약을 보내는 게 아니라면 본문 내용을 지우십시오.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "%s.final을 여는데 실패: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "%s을(를) 여는데 실패: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "To/Cc/Bcc 필드가 해석되지 않아서, 무시합니다\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "요약 전자메일이 비어 있어서 넘어갑니다.\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "정말로 <%s>을(를) 사용하시겠습니까 [y/N]? "
# 주의: '8bit'이라고 그대로 쓴다. 메일 encoding 헤더에 쓸 literal을 가리킴
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"다음 파일이 8bit이지만, Content-Transfer-Encoding을 설정하지 않았습니다.\n"
# 주의: '8bit'이라고 그대로 쓴다. 메일 encoding 헤더에 쓸 literal을 가리킴
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "어떤 8bit 인코딩을 선언합니까 [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"제목 서식인 '*** SUBJECT HERE ***'가 들어 있습니다. 정말로 보내려면 --force "
"옵션을 사용하십시오.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "누구에게 전자메일을 보내야 합니까 (보낼 대상이 있다면)?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "치명적 오류: '%s' 별칭은 자기 자신을 가리킵니다\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "첫 메일에 대해 (있다면) Message-ID가 In-Reply-To에 사용되었습니다? "
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "오류: 다음에서 올바른 주소를 추출할 수 없습니다: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "이 주소로 무엇을 하시겠습니까? ([q]끝내기|[d]버리기|[e]편집): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "\"%s\" CA 경로가 없습니다"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "이 전자메일을 보내시겠습니까? ([y]예|[n]아니오|[q]끝내기|[a]모두): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
msgstr "필요한 전자메일 답장 보냅니다"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr "필요한 SMTP 서버를 제대로 지정하지 않았습니다."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "서버에서 STARTTLS를 지원하지 않습니다! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 실패! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"SMTP를 제대로 초기화할 수 없습니다. 설정을 확인하고 --smtp-debug 옵션을 사용"
"하십시오."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr "%s을(를) 보내는데 실패했습니다\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "%s 보내는 흉내\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr "%s 보냄\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr "성공 흉내. 기록은:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr "성공. 기록은:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr "결과: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr "결과: 정상\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr "%s 파일을 열 수 없습니다"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) cc: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) to: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox아님) cc: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(본문) cc: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s'을 실행할 수 없습니다"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) %s: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) '%s'(을)를 향한 파이프를 닫는데 실패했습니다"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr "메시지를 7비트로 보낼 수 없습니다"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
msgstr "잘못된 전송 인코딩"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "%s을(를) 열 수 없습니다: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: 패치에 998자보다 더 긴 줄이 들어 있습니다"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s 넘어감, 예비 확장자 '%s' 있음.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "정말로 %s 파일을 보내시겠습니까? [y|N]: "
msgstr ""
"Project-Id-Version: git 2.15.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-10-08 09:48+0800\n"
-"PO-Revision-Date: 2017-10-11 11:31+0100\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-18 19:34+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
#: builtin/shortlog.c:191
msgid "Filtering content"
msgstr "Filtrerar innehåll"
-#: entry.c:417
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs.c:1779
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:104
+#: ref-filter.c:105
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:106
+#: ref-filter.c:107
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:126
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:130
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:132
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:172
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:179
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:186
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) tar inte argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:205
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:207
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:220
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "positivt värde förväntat objectname:short=%s"
-#: ref-filter.c:224
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:251
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:263
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:267
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:273
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:277
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:292
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:382
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:408
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:520
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:580
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:582
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:584
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:610
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:612
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:614
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:627
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:682
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1268
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1271
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1279
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1286
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: ref-filter.c:1290
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(ingen gren)"
-#: ref-filter.c:1439 ref-filter.c:1470
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1442 ref-filter.c:1473
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1773
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1840
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:1845
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2107
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2201
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
#: sequencer.c:2561
#, c-format
-msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#: sequencer.c:2561
-#, c-format
-msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) tar inte argument"
+
+#~ msgid ""
+#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
+#~ msgstr ""
+#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
+
#~ msgid "%"
#~ msgid_plural "%"
#~ msgstr[0] "%"