summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-interpret-trailers.txt3
-rw-r--r--builtin/stripspace.c4
-rw-r--r--git-rebase--interactive.sh13
-rw-r--r--po/fr.po5020
-rw-r--r--po/git.pot4706
-rw-r--r--po/ko.po5221
-rw-r--r--po/pt_PT.po4990
-rw-r--r--po/ru.po4429
-rw-r--r--po/sv.po4967
-rw-r--r--po/vi.po4965
-rw-r--r--po/zh_CN.po4917
-rw-r--r--ref-filter.c2
-rw-r--r--sequencer.c2
-rwxr-xr-xt/t0030-stripspace.sh9
-rwxr-xr-xt/t3404-rebase-interactive.sh11
-rwxr-xr-xt/t6300-for-each-ref.sh10
16 files changed, 23160 insertions, 16109 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index e99bda6..09074c7 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -49,7 +49,8 @@ will be added before the new trailer.
Existing trailers are extracted from the input message by looking for
a group of one or more lines that (i) are all trailers, or (ii) contains at
-least one Git-generated trailer and consists of at least 25% trailers.
+least one Git-generated or user-configured trailer and consists of at
+least 25% trailers.
The group must be preceded by one or more empty (or whitespace-only) lines.
The group must either be at the end of the message or be the last
non-whitespace lines before a line that starts with '---'. Such three
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 15e716e..1e62a00 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -44,8 +44,10 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix)
if (argc)
usage_with_options(stripspace_usage, options);
- if (mode == STRIP_COMMENTS || mode == COMMENT_LINES)
+ if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) {
+ setup_git_directory_gently(NULL);
git_config(git_default_config, NULL);
+ }
if (strbuf_read(&buf, 0, 1024) < 0)
die_errno("could not read the input");
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ca994c5..41fd374 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -93,8 +93,17 @@ eval '
GIT_CHERRY_PICK_HELP="$resolvemsg"
export GIT_CHERRY_PICK_HELP
-comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1)
-: ${comment_char:=#}
+comment_char=$(git config --get core.commentchar 2>/dev/null)
+case "$comment_char" in
+'' | auto)
+ comment_char="#"
+ ;;
+?)
+ ;;
+*)
+ comment_char=$(echo "$comment_char" | cut -c1)
+ ;;
+esac
warn () {
printf '%s\n' "$*" >&2
diff --git a/po/fr.po b/po/fr.po
index aeb4155..6db6893 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
-"PO-Revision-Date: 2016-08-28 11:26+0200\n"
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
+"PO-Revision-Date: 2016-11-22 22:16+0800\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"
@@ -169,6 +169,640 @@ msgstr ""
" git checkout -b <nom-de-la-nouvelle-branche>\n"
"\n"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "option d'espace non reconnue '%s'"
+
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "option d'ignorance d'espace non reconnue '%s'"
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way hors d'un dépôt"
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index hors d'un dépôt"
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached hors d'un dépôt"
+
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Impossible de préparer la regexp d'horodatage %s"
+
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec a retourné %d pour l'entrée : %s"
+
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "nom de fichier du patch introuvable à la ligne %d"
+
+#: apply.c:977
+#, 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:983
+#, 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:984
+#, 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:990
+#, 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:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recomptage : ligne inattendue : %.*s"
+
+#: apply.c:1557
+#, 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:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"information de nom de fichier manquante dans l'en-tête de git diff lors de "
+"la suppression de %d composant de préfixe de chemin (ligne %d)"
+msgstr[1] ""
+"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:1589
+#, 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:1759
+msgid "new file depends on old contents"
+msgstr "le nouveau fichier dépend de contenus anciens"
+
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "le fichier supprimé a encore du contenu"
+
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "patch corrompu à la ligne %d"
+
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "le nouveau fichier %s dépend de contenus anciens"
+
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "le fichier supprimé %s a encore du contenu"
+
+#: apply.c:1837
+#, 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:1984
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "patch binaire corrompu à la ligne %d : %.*s"
+
+#: apply.c:2021
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "patch binaire non reconnu à la ligne %d"
+
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "patch totalement incompréhensible à la ligne %d"
+
+#: apply.c:2274
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "lecture du lien symbolique %s impossible"
+
+#: apply.c:2278
+#, c-format
+msgid "unable to open or read %s"
+msgstr "ouverture ou lecture de %s impossible"
+
+#: apply.c:2931
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "début de ligne invalide : '%c'"
+
+#: apply.c:3050
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "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:3062
+#, 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:3068
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"pendant la recherche de :\n"
+"%.*s"
+
+#: apply.c:3090
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "données de patch binaire manquantes pour '%s'"
+
+#: apply.c:3098
+#, 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:3144
+#, 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:3154
+#, 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:3162
+#, 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:3180
+#, 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:3193
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "le patch binaire ne s'applique par correctement à '%s'"
+
+#: apply.c:3199
+#, 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:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "le patch a échoué : %s:%ld"
+
+#: apply.c:3342
+#, c-format
+msgid "cannot checkout %s"
+msgstr "extraction de %s impossible"
+
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr "échec de la lecture de %s"
+
+#: apply.c:3398
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
+
+#: apply.c:3427 apply.c:3667
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "le chemin %s a été renommé/supprimé"
+
+#: apply.c:3510 apply.c:3681
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s : n'existe pas dans l'index"
+
+#: apply.c:3519 apply.c:3689
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s : ne correspond pas à l'index"
+
+#: apply.c:3554
+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:3557
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Retour à une fusion à 3 points…\n"
+
+#: apply.c:3573 apply.c:3577
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "impossible de lire le contenu actuel de '%s'"
+
+#: apply.c:3589
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Echec du retour à une fusion à 3 points…\n"
+
+#: apply.c:3603
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Patch %s appliqué avec des conflits.\n"
+
+#: apply.c:3608
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Patch %s appliqué proprement.\n"
+
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "le patch de suppression laisse un contenu dans le fichier"
+
+#: apply.c:3706
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s : type erroné"
+
+#: apply.c:3708
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s est de type %o, mais %o attendu"
+
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "chemin invalide '%s'"
+
+#: apply.c:3917
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s : existe déjà dans l'index"
+
+#: apply.c:3920
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s : existe déjà dans la copie de travail"
+
+#: apply.c:3940
+#, 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:3945
+#, 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:3965
+#, 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:3969
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s : le patch ne s'applique pas"
+
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Vérification du patch %s..."
+
+#: apply.c:4075
+#, 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:4082
+#, 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:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
+
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "échec de make_cache_entry pour le chemin '%s'"
+
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "impossible d'ajouter %s à l'index temporaire"
+
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "impossible d'écrire l'index temporaire dans %s"
+
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "suppression de %s dans l'index impossible"
+
+#: apply.c:4277
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "patch corrompu pour le sous-module %s"
+
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "stat du fichier nouvellement créé '%s' impossible"
+
+#: apply.c:4291
+#, 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:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "ajout de l'élément de cache %s impossible"
+
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "échec de l'écriture dans '%s'"
+
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr "fermeture du fichier '%s'"
+
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "écriture du fichier '%s' mode %o impossible"
+
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Patch %s appliqué proprement."
+
+#: apply.c:4518
+msgid "internal error"
+msgstr "erreur interne"
+
+#: apply.c:4521
+#, 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:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "troncature du nom de fichier .rej en %.*s.rej"
+
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr "impossible d'ouvrir %s"
+
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Section n°%d appliquée proprement."
+
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Section n°%d rejetée."
+
+#: apply.c:4668
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Chemin '%s' non traité."
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "entrée non reconnue"
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "lecture du fichier d'index impossible"
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "ouverture impossible du patch '%s' :%s"
+
+#: apply.c:4858
+#, 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:4864 apply.c:4879
+#, 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:4872
+#, 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "Impossible d'écrire le nouveau fichier d'index"
+
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "chemin"
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "appliquer les modifications qui correspondent au chemin donné"
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "num"
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "ignorer les additions réalisées par le patch"
+
+#: apply.c:4931
+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:4935
+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:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
+
+#: apply.c:4939
+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:4941
+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:4943
+msgid "apply a patch without touching the working tree"
+msgstr "appliquer les patch sans toucher à la copie de travail"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "accepter un patch qui touche hors de la copie de travail"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
+
+#: apply.c:4949
+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:4951
+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:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "les chemins sont séparés par un caractère NUL"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "action"
+
+#: apply.c:4958
+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:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "appliquer le patch en sens inverse"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "ne pas s'attendre à au moins une ligne de contexte"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "accepter les recouvrements de sections"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "mode verbeux"
+
+#: apply.c:4976
+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:4979
+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:4981 builtin/am.c:2274
+msgid "root"
+msgstr "racine"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "préfixer tous les noms de fichier avec <root>"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
@@ -188,7 +822,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
@@ -201,7 +835,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:430 builtin/log.c:1422
+#: archive.c:430 builtin/log.c:1429
msgid "prefix"
msgstr "préfixe"
@@ -209,11 +843,11 @@ msgstr "préfixe"
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fichier"
@@ -245,8 +879,8 @@ msgstr "compression efficace"
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
msgid "repo"
msgstr "dépôt"
@@ -254,7 +888,7 @@ msgstr "dépôt"
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "commande"
@@ -536,27 +1170,27 @@ msgstr ""
"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:266
+#: branch.c:265
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nom d'objet invalide : '%s'."
-#: branch.c:286
+#: branch.c:285
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objet ambigu : '%s'."
-#: branch.c:291
+#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:345
+#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:364
+#: branch.c:363
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
@@ -571,7 +1205,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:778
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -580,9 +1214,9 @@ msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -622,7 +1256,7 @@ msgstr "rev-list a disparu"
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:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -645,8 +1279,8 @@ msgstr "l'index de groupe a disparu"
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -656,6 +1290,18 @@ msgstr "impossible d'analyser %s"
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
+#: commit.c:1514
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Avertissement : le message de validation ne se conforme pas à UTF-8.\n"
+"Vous souhaitez peut-être le modifier après correction du message ou régler "
+"la\n"
+"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
+"projet.\n"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "plus de mémoire"
@@ -749,7 +1395,7 @@ msgstr ""
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:849 config.c:860
+#: config.c:852 config.c:863
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
@@ -794,22 +1440,68 @@ msgstr "impossible de régler '%s' à '%s'"
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "L'hôte distant a fermé la connexion lors du contact initial"
+
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Impossilble de lire le dépôt distant.\n"
+"\n"
+"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:173 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:74
+#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:94
+#: connected.c:95
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:101
+#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
+#: convert.c:201
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"Les CRLF seront remplacés par des LF dans %s.\n"
+"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
+"travail."
+
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "Les CRLF seraient remplacés par des LF dans %s."
+
+#: convert.c:211
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"Les LF seront remplacés par des CRLF dans %s.\n"
+"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
+"travail."
+
+#: convert.c:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "Les LF seraient remplacés par des CRLF dans %s"
+
#: date.c:97
msgid "in the future"
msgstr "dans le futur"
@@ -883,28 +1575,33 @@ msgstr[1] "il y a %lu ans"
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:540
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:116
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "le commutateur '%s' a besoin d'une valeur"
+
+#: diff.c:124
#, 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:121
+#: diff.c:129
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:225
+#: diff.c:283
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:277
+#: diff.c:346
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -913,16 +1610,20 @@ msgstr ""
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3017
+#: diff.c:3087
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3415
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
+
+#: diff.c:3502
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3578
+#: diff.c:3665
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -931,61 +1632,248 @@ msgstr ""
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3592
+#: diff.c:3679
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: dir.c:1823
+#: diff.c:4700
+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:4703
+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:4706
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
+"commande."
+
+#: dir.c:1866
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:1942
+#: dir.c:1985
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."
-#: gpg-interface.c:178
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack : list courte attendue"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
+
+#: fetch-pack.c:243
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
+
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc nécessite multi_ack_detailed"
+
+#: fetch-pack.c:381
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "ligne de superficiel invalide : %s"
+
+#: fetch-pack.c:387
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "ligne de fin de superficiel invalide : %s"
+
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
+msgstr "objet non trouvé : %s"
+
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
+msgstr "Erreur dans l'objet : %s"
+
+#: fetch-pack.c:394
+#, c-format
+msgid "no shallow found: %s"
+msgstr "Pas de superficiel trouvé : %s"
+
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "superficiel/non superficiel attendu, %s trouvé"
+
+#: fetch-pack.c:436
+#, c-format
+msgid "got %s %d %s"
+msgstr "réponse %s %d %s"
+
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit invalide %s"
+
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "abandon"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "fait"
+
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "%s trouvé (%d) %s"
+
+#: fetch-pack.c:551
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Marquage de %s comme terminé"
+
+#: fetch-pack.c:697
+#, c-format
+msgid "already have %s (%s)"
+msgstr "%s déjà possédé (%s)"
+
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "erreur de protocole : mauvais entête de paquet"
+
+#: fetch-pack.c:799
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack : impossible de dupliquer %s"
+
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "échec de %s"
+
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "erreur dans le démultiplexer latéral"
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "Le serveur ne supporte les clients superficiels"
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "Le serveur supporte multi_ack_detailed"
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "Le serveur support no-done"
+
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr "Le serveur supporte multi_ack"
+
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr "Le serveur supporte side-band-64k"
+
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr "Le serveru supporte side-band"
+
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Le serveur supporte allow-tip-sha1-in-want"
+
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Le serveur supporte allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr "Le serveur support ofs-delta"
+
+#: fetch-pack.c:890
+#, c-format
+msgid "Server version is %.*s"
+msgstr "La version du serveur est %.*s"
+
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr "Le receveur ne gère pas --shallow-since"
+
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr "Le receveur ne gère pas --shallow-exclude"
+
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr "Le receveur ne gère pas --deepen"
+
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr "pas de commit commun"
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack : échec de le récupération."
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr "pas de HEAD distante correspondante"
+
+#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:208
+#: gpg-interface.c:215
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:210
+#: gpg-interface.c:217
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: grep.c:1792
+#: grep.c:1782
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1820
+#: grep.c:1810
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
-#: help.c:205
+#: help.c:203
#, c-format
msgid "available git commands in '%s'"
msgstr "commandes git disponibles dans '%s'"
-#: help.c:212
+#: help.c:210
msgid "git commands available from elsewhere on your $PATH"
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: help.c:244
+#: help.c:241
msgid "These are common Git commands used in various situations:"
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: help.c:309
+#: help.c:306
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -994,11 +1882,11 @@ msgstr ""
"'%s' semble être une commande git, mais elle n'a pas pu\n"
"être exécutée. Peut-être git-%s est-elle cassée ?"
-#: help.c:366
+#: help.c:361
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ahem. Votre système n'indique aucune commande Git."
-#: help.c:388
+#: help.c:383
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -1008,17 +1896,17 @@ msgstr ""
"pas.\n"
"Continuons en supposant que vous avez voulu dire '%s'"
-#: help.c:393
+#: help.c:388
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "dans %0.1f secondes automatiquement..."
-#: help.c:400
+#: help.c:395
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: help.c:404 help.c:470
+#: help.c:399 help.c:465
msgid ""
"\n"
"Did you mean this?"
@@ -1032,11 +1920,37 @@ msgstr[1] ""
"\n"
"Vouliez-vous dire un de ceux-là ?"
-#: help.c:466
+#: help.c:461
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: ident.c:334
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Veuillez me dire qui vous êtes.\n"
+"\n"
+"Lancez\n"
+"\n"
+" git config --global user.email \"Vous@exemple.com\"\n"
+" git config --global user.name \"Votre Nom\"\n"
+"\n"
+"pour régler l'identité par défaut de votre compte.\n"
+"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
+"\n"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1065,8 +1979,8 @@ msgstr "Impossible de créer '%s.lock' : %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -1102,7 +2016,7 @@ msgstr ": peut-être un conflit D/F ?"
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
@@ -1244,7 +2158,7 @@ msgstr "%s sauté (fusion identique à l'existant)"
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1736 git-submodule.sh:919
+#: merge-recursive.c:1736 git-submodule.sh:924
msgid "submodule"
msgstr "sous-module"
@@ -1310,6 +2224,22 @@ msgstr "Impossible d'analyser l'objet '%s'"
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
+#: notes-merge.c:273
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
+msgstr ""
+"Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\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
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
+
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
@@ -1366,7 +2296,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:798
+#: path.c:826
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
@@ -1426,12 +2356,21 @@ msgstr ""
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:433
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+"les chaines de caractères vides comme spécificateurs de chemin seront "
+"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
+"correspondre à tous le chemins"
+
+#: pathspec.c:440
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pathspec.c:442
+#: pathspec.c:449
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
@@ -1439,15 +2378,11 @@ msgstr ""
"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-#: pretty.c:973
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: progress.c:235
-msgid "done"
-msgstr "fait"
-
-#: read-cache.c:1281
+#: read-cache.c:1315
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1456,7 +2391,7 @@ msgstr ""
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1291
+#: read-cache.c:1325
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1465,22 +2400,22 @@ msgstr ""
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: refs.c:551 builtin/merge.c:840
+#: refs.c:576 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs/files-backend.c:2534
+#: refs/files-backend.c:2481
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:2537
+#: refs/files-backend.c:2484
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:2546
+#: refs/files-backend.c:2493
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
@@ -1609,12 +2544,12 @@ msgstr "réf avec un nom cassé %s ignoré"
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:1651
+#: ref-filter.c:1633
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:1705
+#: ref-filter.c:1687
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
@@ -1744,37 +2679,37 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: revision.c:2132
+#: revision.c:2158
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2135
+#: revision.c:2161
#, 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:2329
+#: revision.c:2355
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: run-command.c:92
+#: run-command.c:106
msgid "open /dev/null failed"
msgstr "échec de l'ouverture de /dev/null"
-#: run-command.c:94
+#: run-command.c:108
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "échec de dup2(%d,%d)"
-#: send-pack.c:298
+#: send-pack.c:297
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:411
+#: send-pack.c:410
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:413
+#: send-pack.c:412
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1782,15 +2717,23 @@ msgstr ""
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:425
+#: send-pack.c:424
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:430
+#: send-pack.c:429
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
-#: sequencer.c:174
+#: sequencer.c:171
+msgid "revert"
+msgstr "revert"
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:228
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -1798,7 +2741,7 @@ msgstr ""
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:177
+#: sequencer.c:231
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -1808,231 +2751,258 @@ msgstr ""
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Could not write to %s"
-msgstr "Impossible d'écrire dans %s"
+msgid "could not lock '%s'"
+msgstr "impossible de verrouiller '%s'"
+
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossible d'écrire dans '%s'"
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: sequencer.c:251
#, c-format
-msgid "Error wrapping up %s."
-msgstr "Erreur lors de l'emballage de %s."
+msgid "could not write eol to '%s"
+msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Vos modifications locales seraient écrasées par cherry-pick."
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "échec lors de la finalisation de '%s'."
+
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
-msgstr "Vos modifications locales seraient écrasées par revert."
+#: sequencer.c:305
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
-msgstr "Validez vos modifications ou les remiser pour continuer."
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:228
+#: sequencer.c:324
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: sequencer.c:399
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
-msgstr "Impossible de résoudre le commit HEAD\n"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr "impossible de résoudre le commit HEAD\n"
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
-msgstr "Impossible de mettre à jour l'arbre de cache\n"
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
+msgstr "impossible de mettre à jour l'arbre de cache\n"
-#: sequencer.c:393
+#: sequencer.c:483
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Impossible d'analyser le commit %s\n"
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Vous avez des modifications indexées dans votre copie de travail.\n"
+"Si elles devaient être ajoutées dans le commit précédent, lancez :\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Si elles devaient aller dans un nouveau commit, lancez :\n"
+"\n"
+" git commit %s\n"
+"\n"
+"Dans les deux cas, une fois fini, continuez avec :\n"
+"\n"
+" git rebase --continue\n"
-#: sequencer.c:398
+#: sequencer.c:567
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "Impossible d'analyser le commit parent %s\n"
+msgid "could not parse commit %s\n"
+msgstr "impossible d'analyser le commit %s\n"
-#: sequencer.c:463
-msgid "Your index file is unmerged."
-msgstr "Votre fichier d'index n'est pas fusionné."
+#: sequencer.c:572
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "impossible d'analyser le commit parent %s\n"
+
+#: sequencer.c:656
+msgid "your index file is unmerged."
+msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:482
+#: sequencer.c:675
#, 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."
+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:490
+#: sequencer.c:683
#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr "Le commit %s n'a pas le parent %d"
+msgid "commit %s does not have parent %d"
+msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:494
+#: sequencer.c:687
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+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 "
+"une branche principale a été spécifiée mais le commit %s n'est pas une "
"fusion."
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:511
+#: sequencer.c:705
#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Impossible d'obtenir un message de validation pour %s"
+msgid "cannot get commit message for %s"
+msgstr "impossible d'obtenir un message de validation pour %s"
-#: sequencer.c:597
+#: sequencer.c:797
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:598
+#: sequencer.c:798
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:633
+#: sequencer.c:833
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:641
+#: sequencer.c:843
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:645
+#: sequencer.c:850
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr "Impossible d'annuler un commit pendant un picorage."
-
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
-msgstr "Impossible de picorer pendant l'annulation d'un commit."
-
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
-msgstr "Impossible de picorer pendant un autre picorage."
-
-#: sequencer.c:732
+#: sequencer.c:944
#, c-format
-msgid "Could not parse line %d."
-msgstr "Impossible d'analyser la ligne %d."
+msgid "invalid line %d: %.*s"
+msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr "Aucun commit analysé."
+#: sequencer.c:950
+msgid "no commits parsed."
+msgstr "aucun commit analysé."
-#: sequencer.c:749
+#: sequencer.c:966
#, c-format
-msgid "Could not open %s"
-msgstr "Impossible d'ouvrir %s"
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
-#: sequencer.c:753
+#: sequencer.c:972
#, c-format
-msgid "Could not read %s."
-msgstr "Impossible de lire %s."
+msgid "unusable instruction sheet: '%s'"
+msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "Feuille d'instruction inutilisable : %s"
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
+msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:790
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
+msgstr "impossible d'annuler un commit pendant un picorage."
+
+#: sequencer.c:1028
#, c-format
-msgid "Invalid key: %s"
-msgstr "Clé invalide: %s"
+msgid "invalid key: %s"
+msgstr "clé invalide : %s"
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:1031
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valeur invalide pour %s : %s"
+msgid "invalid value for %s: %s"
+msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:803
+#: sequencer.c:1063
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "Feuille d'options malformée : %s"
+msgid "malformed options sheet: '%s'"
+msgstr "feuille d'options malformée : %s"
-#: sequencer.c:822
+#: sequencer.c:1101
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:823
+#: sequencer.c:1102
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:827
+#: sequencer.c:1106
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "Impossible de créer le répertoire de séquenceur %s"
+msgid "could not create sequencer directory '%s'"
+msgstr "impossible de créer le répertoire de séquenceur '%s'"
+
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:1151 sequencer.c:1289
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:864
+#: sequencer.c:1153
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:866 sequencer.c:900
+#: sequencer.c:1155 sequencer.c:1189
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "cannot open %s"
-msgstr "impossible d'ouvrir %s"
+msgid "cannot open '%s'"
+msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:888
+#: sequencer.c:1177
#, c-format
-msgid "cannot read %s: %s"
-msgstr "impossible de lire %s : %s"
+msgid "cannot read '%s': %s"
+msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:889
+#: sequencer.c:1178
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:895
+#: sequencer.c:1184
#, 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:921
-#, c-format
-msgid "Could not format %s."
-msgstr "Impossible de formater %s."
-
-#: sequencer.c:1066
+#: sequencer.c:1354
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:1069
+#: sequencer.c:1358
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
-msgstr "Impossible d'annuler en tant que commit initial"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
+msgstr "impossible d'annuler en tant que commit initial"
#: setup.c:160
#, c-format
@@ -2066,11 +3036,6 @@ msgstr ""
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr "échec de la lecture de %s"
-
#: setup.c:468
#, c-format
msgid "Expected git repo version <= %d, found %d"
@@ -2119,22 +3084,58 @@ msgstr ""
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: sha1_file.c:1046
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "le chemin '%s' n'existe pas"
+
+#: sha1_file.c:499
+#, 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:505
+#, 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:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "le dépôt de référence '%s' est superficiel"
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "le dépôt de référence '%s' est greffé"
+
+#: sha1_file.c:1159
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: sha1_file.c:2434
+#: sha1_file.c:2592
#, 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:2438
+#: sha1_file.c:2596
#, 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:462
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "le SHA1 court %s est ambigu"
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr "Les candidats sont :"
+
+#: sha1_name.c:578
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -2185,7 +3186,7 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:177
+#: submodule.c:158
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
@@ -2194,56 +3195,56 @@ msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
-#: trailer.c:237
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "échec de la commande trailer '%s'"
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'"
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
-#: trailer.c:582
+#: trailer.c:672
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "symbole vide dans la ligne de fin '%.*s'"
-#: trailer.c:702
+#: trailer.c:695
#, c-format
msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'"
-#: trailer.c:705
+#: trailer.c:698
msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard"
-#: trailer.c:857 builtin/am.c:42
+#: trailer.c:929 builtin/am.c:44
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
-#: trailer.c:859
+#: trailer.c:931
#, c-format
msgid "file %s is not a regular file"
msgstr "%s n'est pas un fichier régulier"
-#: trailer.c:861
+#: trailer.c:933
#, c-format
msgid "file %s is not writable by user"
msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
-#: trailer.c:873
+#: trailer.c:945
msgid "could not open temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: trailer.c:912
+#: trailer.c:983
#, c-format
msgid "could not rename temporary file to %s"
msgstr "impossible de renommer un fichier temporaire en %s"
@@ -2258,7 +3259,7 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:771
+#: transport.c:817
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -2267,7 +3268,7 @@ msgstr ""
"Les chemins suivant de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:775
+#: transport.c:821
#, c-format
msgid ""
"\n"
@@ -2294,15 +3295,31 @@ msgstr ""
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:783
+#: transport.c:829
msgid "Aborting."
msgstr "Abandon."
-#: transport-helper.c:1041
+#: transport-helper.c:1075
#, c-format
msgid "Could not read ref %s"
msgstr "impossible de lire la réf %s"
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objet arbre trop court"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "mode invalide dans l'entrée d'arbre"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nom de fichier vide dans une entrée de l'arbre"
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "fichier arbre trop court"
+
#: unpack-trees.c:64
#, c-format
msgid ""
@@ -2506,18 +3523,18 @@ msgstr ""
#: unpack-trees.c:126
#, c-format
msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
+"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
-"jour par extraction creuse :\n"
+"jour par l'extraction creuse :\n"
"%s"
#: unpack-trees.c:128
#, c-format
msgid ""
-"The following Working tree files would be removed by sparse checkout "
+"The following working tree files would be removed by sparse checkout "
"update:\n"
"%s"
msgstr ""
@@ -2573,14 +3590,14 @@ msgstr "échec de la lecture de '%s'"
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
@@ -2604,151 +3621,151 @@ msgstr "Impossible d'écrire dans %s"
msgid "could not close %s"
msgstr "impossible de fermer %s"
-#: wt-status.c:150
+#: wt-status.c:151
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:183
+#: wt-status.c:184
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:187
+#: wt-status.c:188
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:198 wt-status.c:882
+#: wt-status.c:199 wt-status.c:945
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:216 wt-status.c:891
+#: wt-status.c:217 wt-status.c:954
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:220
+#: wt-status.c:221
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:222
+#: wt-status.c:223
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:223
+#: wt-status.c:224
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:225
+#: wt-status.c:226
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:237
+#: wt-status.c:238
#, 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:252
+#: wt-status.c:253
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:254
+#: wt-status.c:255
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:256
+#: wt-status.c:257
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:258
+#: wt-status.c:259
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:260
+#: wt-status.c:261
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:262
+#: wt-status.c:263
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:264
+#: wt-status.c:265
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:274
+#: wt-status.c:275
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:276
+#: wt-status.c:277
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:278
+#: wt-status.c:279
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:280
+#: wt-status.c:281
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:282
+#: wt-status.c:283
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:284
+#: wt-status.c:285
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:286
+#: wt-status.c:287
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:288
+#: wt-status.c:289
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:370
+#: wt-status.c:371
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:372
+#: wt-status.c:373
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:374
+#: wt-status.c:375
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:756
+#: wt-status.c:818
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:758
+#: wt-status.c:820
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:839
+#: wt-status.c:901
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2756,103 +3773,103 @@ msgstr ""
"Ne touchez pas à la ligne ci-dessus\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:950
+#: wt-status.c:1013
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:953
+#: wt-status.c:1016
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:955
+#: wt-status.c:1018
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:960
+#: wt-status.c:1023
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:963
+#: wt-status.c:1026
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:973
+#: wt-status.c:1036
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:976
+#: wt-status.c:1039
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:980
+#: wt-status.c:1043
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:982
+#: wt-status.c:1045
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:984
+#: wt-status.c:1047
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1109
+#: wt-status.c:1172
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1112
+#: wt-status.c:1175
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: wt-status.c:1123
+#: wt-status.c:1186
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1128
+#: wt-status.c:1191
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1131
+#: wt-status.c:1194
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1139
+#: wt-status.c:1202
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1152
+#: wt-status.c:1215
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: wt-status.c:1157
+#: wt-status.c:1220
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1171
+#: wt-status.c:1234
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1173
+#: wt-status.c:1236
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1175
+#: wt-status.c:1238
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: wt-status.c:1181
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1185
+#: wt-status.c:1248
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -2860,124 +3877,124 @@ msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1190
+#: wt-status.c:1253
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:1193
+#: wt-status.c:1256
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:1197
+#: wt-status.c:1260
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:1202
+#: wt-status.c:1265
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:1205
+#: wt-status.c:1268
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1207
+#: wt-status.c:1270
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
"modifications)"
-#: wt-status.c:1217
+#: wt-status.c:1280
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1222
+#: wt-status.c:1285
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1288
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1227
+#: wt-status.c:1290
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:1236
+#: wt-status.c:1299
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1241
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1244
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1246
+#: wt-status.c:1309
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1257
+#: wt-status.c:1320
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:1261
+#: wt-status.c:1324
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1264
+#: wt-status.c:1327
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1464
+#: wt-status.c:1524
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1470
+#: wt-status.c:1530
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1472
+#: wt-status.c:1532
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1477
+#: wt-status.c:1537
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1479
+#: wt-status.c:1539
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1482
+#: wt-status.c:1542
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1500
+#: wt-status.c:1560
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1514
+#: wt-status.c:1574
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1516
+#: wt-status.c:1576
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1520
+#: wt-status.c:1580
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2989,32 +4006,32 @@ msgstr ""
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1526
+#: wt-status.c:1586
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1528
+#: wt-status.c:1588
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1534
+#: wt-status.c:1594
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1539
+#: wt-status.c:1599
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1542
+#: wt-status.c:1602
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1545
+#: wt-status.c:1605
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -3023,57 +4040,72 @@ msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1548
+#: wt-status.c:1608
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1551
+#: wt-status.c:1611
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1554 wt-status.c:1559
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1557
+#: wt-status.c:1617
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1561
+#: wt-status.c:1621
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1668
+#: wt-status.c:1728
msgid "Initial commit on "
msgstr "Validation initiale sur "
-#: wt-status.c:1672
+#: wt-status.c:1732
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
# à priori on parle d'une branche ici
-#: wt-status.c:1701
+#: wt-status.c:1761
msgid "gone"
msgstr "disparue"
-#: wt-status.c:1703 wt-status.c:1711
+#: wt-status.c:1763 wt-status.c:1771
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1706 wt-status.c:1709
+#: wt-status.c:1766 wt-status.c:1769
msgid "ahead "
msgstr "devant "
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "Impossible de %s : vous avez des modifications non indexées."
+
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr "de plus, votre index contient des modifications non validées."
+
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s impossible : votre index contient des modifications non validées."
+
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
@@ -3082,280 +4114,265 @@ msgstr "échec lors de l'unlink de '%s'"
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:65
+#: builtin/add.c:80
#, c-format
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
-#: builtin/add.c:71 builtin/commit.c:281
+#: builtin/add.c:85 builtin/commit.c:291
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:81
+#: builtin/add.c:95
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:136
+#: builtin/add.c:149
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:196 builtin/rev-parse.c:811
+#: builtin/add.c:209 builtin/rev-parse.c:840
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:207
+#: builtin/add.c:220
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:211
+#: builtin/add.c:224
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:214
+#: builtin/add.c:227
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:217
+#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:219
+#: builtin/add.c:232
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:224
+#: builtin/add.c:237
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:234
+#: builtin/add.c:247
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:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "mode verbeux"
-
-#: builtin/add.c:256
+#: builtin/add.c:269
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:258
+#: builtin/add.c:271
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:259
+#: builtin/add.c:272
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:260
+#: builtin/add.c:273
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:261
+#: builtin/add.c:274
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:262
+#: builtin/add.c:275
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:265
+#: builtin/add.c:278
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:267
+#: builtin/add.c:280
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:268
+#: builtin/add.c:281
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:269
+#: builtin/add.c:282
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:270 builtin/update-index.c:958
+#: builtin/add.c:283 builtin/update-index.c:947
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:270 builtin/update-index.c:959
+#: builtin/add.c:283 builtin/update-index.c:948
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:292
+#: builtin/add.c:305
#, 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:300
+#: builtin/add.c:312
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:336
+#: builtin/add.c:348
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:343
+#: builtin/add.c:355
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:352
+#: builtin/add.c:359
#, 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:367
+#: builtin/add.c:374
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:368
+#: builtin/add.c:375
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
+#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr "Impossible d'écrire le nouveau fichier d'index"
-
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: builtin/am.c:426
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:503
+#: builtin/am.c:491
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:544 builtin/notes.c:301
+#: builtin/am.c:532
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:581 builtin/notes.c:316
+#: builtin/am.c:569
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:607
+#: builtin/am.c:595
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:787
+#: builtin/am.c:775
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:852
+#: builtin/am.c:840
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:899
+#: builtin/am.c:887
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:902 builtin/am.c:910
+#: builtin/am.c:890 builtin/am.c:898
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:907
+#: builtin/am.c:895
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:996
+#: builtin/am.c:984
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:1001 builtin/clone.c:380
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:1005
+#: builtin/am.c:993
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1137 builtin/commit.c:366
+#: builtin/am.c:1125 builtin/commit.c:376
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1188
+#: builtin/am.c:1176
#, 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:1189
+#: builtin/am.c:1177
#, 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:1190
+#: builtin/am.c:1178
#, 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:1328
+#: builtin/am.c:1316
msgid "Patch is empty. Was it split wrong?"
msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/am.c:1402 builtin/log.c:1543
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1417
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1602
+#: builtin/am.c:1610
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:1604
+#: builtin/am.c:1612
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:1623
+#: builtin/am.c:1631
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -3363,38 +4380,38 @@ msgstr ""
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1629
+#: builtin/am.c:1637
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1654
+#: builtin/am.c:1662
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1679 builtin/merge.c:628
+#: builtin/am.c:1686 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1686
+#: builtin/am.c:1693
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1731 builtin/am.c:1735
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1751
+#: builtin/am.c:1759
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:1756
+#: builtin/am.c:1764
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -3402,35 +4419,35 @@ msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1766
+#: builtin/am.c:1774
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1816
+#: builtin/am.c:1824
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1853 builtin/am.c:1925
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1869
+#: builtin/am.c:1877
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1877
+#: builtin/am.c:1885
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1883
+#: builtin/am.c:1891
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1928
+#: builtin/am.c:1936
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -3441,7 +4458,7 @@ msgstr ""
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1935
+#: builtin/am.c:1943
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -3449,17 +4466,17 @@ msgstr ""
"Vous avez toujours des chemins non fusionnés dans votre index\n"
"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2095
+#: builtin/am.c:2103
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2129
+#: builtin/am.c:2137
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -3467,156 +4484,135 @@ msgstr ""
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2192
+#: builtin/am.c:2200
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
-msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2226
+#: builtin/am.c:2234
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2232
+#: builtin/am.c:2240
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2234
+#: builtin/am.c:2242
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2236
+#: builtin/am.c:2244
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:172
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2239
+#: builtin/am.c:2247
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:2242
+#: builtin/am.c:2250
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2244
+#: builtin/am.c:2252
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2254
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2248
+#: builtin/am.c:2256
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2250
+#: builtin/am.c:2258
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:2253
+#: builtin/am.c:2261
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:2256
+#: builtin/am.c:2264
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr "action"
-
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr "racine"
-
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr "chemin"
-
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:244
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr "num"
-
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2282
+#: builtin/am.c:2290
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2288
+#: builtin/am.c:2296
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:2290
+#: builtin/am.c:2298
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2293
+#: builtin/am.c:2301
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2296
+#: builtin/am.c:2304
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2299
+#: builtin/am.c:2307
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2303
+#: builtin/am.c:2311
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2305
+#: builtin/am.c:2313
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2308
+#: builtin/am.c:2316
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2311
+#: builtin/am.c:2319
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2326
+#: builtin/am.c:2334
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3624,17 +4620,17 @@ msgstr ""
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2333
+#: builtin/am.c:2341
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2348
+#: builtin/am.c:2356
#, 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:2372
+#: builtin/am.c:2380
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3643,507 +4639,16 @@ msgstr ""
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2378
+#: builtin/am.c:2386
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
"reprise."
-#: builtin/apply.c:122
+#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "option d'espace non reconnue '%s'"
-
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "option d'ignorance d'espace non reconnue '%s'"
-
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Impossible de préparer la regexp d'horodatage %s"
-
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec a retourné %d pour l'entrée : %s"
-
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "nom de fichier du patch introuvable à la ligne %d"
-
-#: builtin/apply.c:984
-#, 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"
-
-#: builtin/apply.c:989
-#, 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"
-
-#: builtin/apply.c:990
-#, 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"
-
-#: builtin/apply.c:995
-#, 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"
-
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recomptage : ligne inattendue : %.*s"
-
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-
-#: builtin/apply.c:1567
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-"information de nom de fichier manquante dans l'en-tête de git diff lors de "
-"la suppression de %d composant de préfixe de chemin (ligne %d)"
-msgstr[1] ""
-"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)"
-
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr "le nouveau fichier dépend de contenus anciens"
-
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr "le fichier supprimé a encore du contenu"
-
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "patch corrompu à la ligne %d"
-
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "le nouveau fichier %s dépend de contenus anciens"
-
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "le fichier supprimé %s a encore du contenu"
-
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "patch binaire corrompu à la ligne %d : %.*s"
-
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "patch binaire non reconnu à la ligne %d"
-
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "patch totalement incompréhensible à la ligne %d"
-
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "lecture du lien symbolique %s impossible"
-
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr "ouverture ou lecture de %s impossible"
-
-#: builtin/apply.c:2901
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "début de ligne invalide : '%c'"
-
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "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)."
-
-#: builtin/apply.c:3032
-#, 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"
-
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"pendant la recherche de :\n"
-"%.*s"
-
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "données de patch binaire manquantes pour '%s'"
-
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "le patch binaire ne s'applique par correctement à '%s'"
-
-#: builtin/apply.c:3169
-#, 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é)"
-
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "le patch a échoué : %s:%ld"
-
-#: builtin/apply.c:3314
-#, c-format
-msgid "cannot checkout %s"
-msgstr "extraction de %s impossible"
-
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "le chemin %s a été renommé/supprimé"
-
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s : n'existe pas dans l'index"
-
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
-#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
-
-#: builtin/apply.c:3491 builtin/apply.c:3652
-#, c-format
-msgid "%s: does not match index"
-msgstr "%s : ne correspond pas à l'index"
-
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr "le patch de suppression laisse un contenu dans le fichier"
-
-#: builtin/apply.c:3669
-#, c-format
-msgid "%s: wrong type"
-msgstr "%s : type erroné"
-
-#: builtin/apply.c:3671
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s est de type %o, mais %o attendu"
-
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr "chemin invalide '%s'"
-
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s : existe déjà dans l'index"
-
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s : existe déjà dans la copie de travail"
-
-#: builtin/apply.c:3902
-#, 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)"
-
-#: builtin/apply.c:3907
-#, 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"
-
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s : le patch ne s'applique pas"
-
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Vérification du patch %s..."
-
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "échec de make_cache_entry pour le chemin '%s'"
-
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "suppression de %s dans l'index impossible"
-
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "patch corrompu pour le sous-module %s"
-
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "stat du fichier nouvellement créé '%s' impossible"
-
-#: builtin/apply.c:4224
-#, 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"
-
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "ajout de l'élément de cache %s impossible"
-
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr "fermeture du fichier '%s'"
-
-#: builtin/apply.c:4313
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "écriture du fichier '%s' mode %o impossible"
-
-#: builtin/apply.c:4403
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Patch %s appliqué proprement."
-
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr "erreur interne"
-
-#: builtin/apply.c:4414
-#, 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..."
-
-#: builtin/apply.c:4424
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "troncature du nom de fichier .rej en %.*s.rej"
-
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "impossible d'ouvrir %s : %s"
-
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Section n°%d appliquée proprement."
-
-#: builtin/apply.c:4448
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Section n°%d rejetée."
-
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr "Chemin '%s' non traité."
-
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr "entrée non reconnue"
-
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr "lecture du fichier d'index impossible"
-
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr "--3way hors d'un dépôt"
-
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr "--index hors d'un dépôt"
-
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr "--cached hors d'un dépôt"
-
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "ouverture impossible du patch '%s'"
-
-#: builtin/apply.c:4760
-#, 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"
-
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d ligne a ajouté des erreurs d'espace."
-msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr "appliquer les modifications qui correspondent au chemin donné"
-
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr "ignorer les additions réalisées par le patch"
-
-#: builtin/apply.c:4811
-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"
-
-#: builtin/apply.c:4815
-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"
-
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
-
-#: builtin/apply.c:4819
-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"
-
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr "s'assurer que le patch est applicable sur l'index actuel"
-
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr "appliquer les patch sans toucher à la copie de travail"
-
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr "accepter un patch qui touche hors de la copie de travail"
-
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-
-#: builtin/apply.c:4829
-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"
-
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-"construire un index temporaire fondé sur l'information de l'index embarqué"
-
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr "les chemins sont séparés par un caractère NUL"
-
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-
-#: builtin/apply.c:4838
-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"
-
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr "appliquer le patch en sens inverse"
-
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr "ne pas s'attendre à au moins une ligne de contexte"
-
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr "accepter les recouvrements de sections"
-
-#: builtin/apply.c:4856
-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"
-
-#: builtin/apply.c:4859
-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"
-
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr "préfixer tous les noms de fichier avec <root>"
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -4203,118 +4708,174 @@ msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
msgid "Blaming lines"
msgstr "Assignation de blâme au lignes"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+"Utiliser une heuristique expérimentale reposant sur l'indentation pour "
+"améliorer les diffs"
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+"Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
+"améliorer le diffs"
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr "score"
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress ne peut pas être utilisé avec --incremental ou les formats "
+"porcelaine"
+
#. TRANSLATORS: This string is used to tell us the maximum
#. display width for a relative timestamp in "git blame"
#. output. For C locale, "4 years, 11 months ago", which
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents et --reverse ne font pas bon ménage."
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse et --first-parent ensemble nécessitent la spécification d'un "
+"dernier commit"
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
+"premier parent"
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr "pas de chemin %s dans %s"
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "impossible de lire le blob %s pour le chemin %s"
+
+#: builtin/blame.c:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "le fichier %s n'a qu'%lu ligne"
+msgstr[1] "le fichier %s n'a que %lu lignes"
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
@@ -4566,6 +5127,10 @@ msgstr "amont"
msgid "change the upstream info"
msgstr "modifier l'information amont"
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr "Désactiver l'information amont"
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
@@ -4638,8 +5203,8 @@ msgstr "clé"
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr "objet"
@@ -4652,7 +5217,7 @@ msgstr "afficher seulement les branches de l'objet"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
@@ -4765,66 +5330,82 @@ msgstr "La création d'un colis requiert un dépôt."
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
-"| <type> | --textconv) <objet>"
+"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
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:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
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:490
+#: builtin/cat-file.c:560
+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:561 git-submodule.sh:923
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "utiliser un chemin spécifique pour --textconv/--filters"
+
+#: builtin/cat-file.c:564
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:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
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:496
+#: builtin/cat-file.c:570
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:499
+#: builtin/cat-file.c:573
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:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
@@ -4844,7 +5425,7 @@ msgstr "afficher tous les attributs associés au fichier"
msgid "use .gitattributes only from the index"
msgstr "utiliser .gitattributes seulement depuis l'index"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
@@ -4853,7 +5434,7 @@ msgid "terminate input and output records by a NUL character"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -4945,9 +5526,9 @@ msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr "chaîne"
@@ -5020,54 +5601,54 @@ msgstr ""
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5090,7 +5671,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5119,151 +5700,151 @@ msgstr[1] ""
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, 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:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
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:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
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:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -5273,12 +5854,12 @@ msgstr ""
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5430,8 +6011,8 @@ msgstr "nettoyage interactif"
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr "motif"
@@ -5471,112 +6052,131 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr "heure"
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr "créer un clone superficiel depuis une date spécifique"
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr "révision"
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr ""
+"approfondir l'historique d'un clone superficiel en excluant une révision"
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -5584,59 +6184,42 @@ msgstr ""
"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:307
-#, 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é."
-
-#: builtin/clone.c:309
+#: builtin/clone.c:303
#, 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."
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "le dépôt de référence '%s' est superficiel"
-
-#: builtin/clone.c:317
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "le dépôt de référence '%s' est greffé"
-
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -5646,125 +6229,145 @@ msgstr ""
"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:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:698
+#: builtin/clone.c:697
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:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, 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:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, 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:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive n'est pas compatible avec à la fois --reference et --"
+"reference-if-able"
+
+#: builtin/clone.c:1019
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:1000
+#: builtin/clone.c:1021
+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:1023
+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:1026
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -5907,66 +6510,66 @@ msgstr ""
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, 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:584
#, 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:603
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5974,38 +6577,38 @@ msgstr ""
"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:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:706
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:710
#, 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:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -6020,7 +6623,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -6035,7 +6638,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -6045,7 +6648,7 @@ msgstr ""
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -6056,150 +6659,154 @@ msgstr ""
"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:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
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:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
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:1166
+#: builtin/commit.c:1171
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:1176
+#: builtin/commit.c:1181
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:1178
+#: builtin/commit.c:1183
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:1186
+#: builtin/commit.c:1191
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:1203
+#: builtin/commit.c:1208
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:1205
+#: builtin/commit.c:1210
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:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1226
+#: 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:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr "version"
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -6207,201 +6814,201 @@ msgstr ""
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr "date"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr "message"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
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:1603
+#: builtin/commit.c:1598
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:1604
+#: builtin/commit.c:1599
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:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, 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:1761
-#, c-format
+#: builtin/commit.c:1754
+#, fuzzy, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "Abandon de la validation du à un message de validation vide\n"
+msgstr "Abandon de la validation dû à un message de validation vide\n"
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6570,11 +7177,20 @@ msgstr ""
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"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:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
@@ -6696,7 +7312,7 @@ msgstr ""
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
@@ -6730,21 +7346,21 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
@@ -6818,165 +7434,169 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
"dépôt distant"
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+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:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr "répertoire"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr "mode par défaut pour la récursion"
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, 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:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, 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:753
+#: builtin/fetch.c:769
#, 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:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6985,55 +7605,55 @@ msgstr ""
"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:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, 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:979
+#: builtin/fetch.c:998
#, 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:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7041,32 +7661,40 @@ msgstr ""
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr "Une profondeur négative dans --deepen n'est pas supportée"
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen et --depth sont mutuellement exclusifs"
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
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:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
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:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
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 "
@@ -7078,23 +7706,23 @@ msgid ""
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
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:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr "fichier d'où lire"
@@ -7211,7 +7839,7 @@ msgstr "afficher la progression"
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr "Vérification des objets"
@@ -7309,233 +7937,228 @@ msgstr "grep : échec de création du fil: %s"
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, 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:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr "impossible d'ouvrir '%s'"
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
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:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:704
+#: builtin/grep.c:705
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:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:718
+#: builtin/grep.c:719
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:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:741
+#: builtin/grep.c:742
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:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
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:901
+#: builtin/grep.c:902
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:906
+#: builtin/grep.c:907
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:909
+#: builtin/grep.c:910
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:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
@@ -7551,85 +8174,89 @@ msgstr ""
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr "type"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr "type d'objet"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr "écrire l'objet dans la base de donnée d'objets"
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr "lire l'objet depuis l'entrée standard"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr "stocker le fichier tel quel sans filtrage"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
"debugger Git"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr "traiter le fichier comme s'il venait de ce chemin"
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr "afficher toutes les commandes disponibles"
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "exclure les guides"
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr "afficher une liste de guides utiles"
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr "afficher la page de manuel"
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr "afficher le manuel dans un navigateur web"
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr "afficher la page info"
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr "échec de démarrage d'emacsclient."
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr "échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -7638,7 +8265,7 @@ msgstr ""
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -7647,301 +8274,305 @@ msgstr ""
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:407
+#: builtin/help.c:409
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:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
-msgstr "usage : %s%s"
-
-#: builtin/help.c:474
+#: builtin/help.c:440
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s\" est un alias de `%s'"
-#: builtin/index-pack.c:153
+#: builtin/help.c:462 builtin/help.c:479
+#, c-format
+msgid "usage: %s%s"
+msgstr "usage : %s%s"
+
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
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:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "le paquet dépasse la taille maximale permise"
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, 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:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
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:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
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:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, 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:1271
+#: builtin/index-pack.c:1272
#, 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:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
@@ -7981,95 +8612,95 @@ msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr "impossible de faire un stat du modèle '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr "impossible d'ouvrir (opendir) '%s'"
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr "impossible de readlink '%s'"
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr "modèle %s ignoré"
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr "modèles non trouvés %s"
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "pas de copie des modèles depuis '%s' : %s"
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
-msgstr "%s existe déjà"
-
-#: builtin/init-db.c:344
+#: builtin/init-db.c:327
#, c-format
msgid "unable to handle file type %d"
msgstr "impossible de traiter le fichier de type %d"
-#: builtin/init-db.c:347
+#: builtin/init-db.c:330
#, c-format
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
-#: builtin/init-db.c:402
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s existe déjà"
+
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Dépôt Git vide initialisé dans %s%s\n"
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -8077,25 +8708,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -8104,7 +8735,7 @@ msgstr ""
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -8217,37 +8848,34 @@ msgstr "Ceci n'est pas une plage."
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1263
+#: builtin/log.c:1267
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -8260,212 +8888,216 @@ msgstr ""
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement."
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1294
+#: builtin/log.c:1298
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:1298
+#: builtin/log.c:1302
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:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1415
+#: builtin/log.c:1419
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:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1419
+#: builtin/log.c:1423
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:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1438
+#: builtin/log.c:1445
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:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
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:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix et -k sont mutuellement exclusifs."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -8473,102 +9105,106 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr "identifier le statut de fichier avec les étiquettes"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
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:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
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:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
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:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr "parcourir récursivement les sous-modules"
+
+#: builtin/ls-files.c:553
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:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
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:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -8689,33 +9325,33 @@ msgstr "Les stratégies disponibles sont :"
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
@@ -8723,28 +9359,28 @@ msgstr "éditer le message avant la validation"
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
@@ -8757,7 +9393,7 @@ msgstr ""
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
@@ -8981,55 +9617,55 @@ msgstr "refus de fusionner des historiques sans relation"
msgid "Already up-to-date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, 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:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, 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:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -9055,23 +9691,23 @@ msgstr "git merge-base --is-ancestor <validation> <validation>"
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <référence> [<validation>]"
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr "afficher tous les ancêtres communs"
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr "trouver les ancêtres pour une fusion simple à n points"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr "afficher les révisions inaccessibles depuis les autres"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr "est le premier ancêtre de l'autre ?"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr "trouver où <validation> a divergé du reflog de <référence>"
@@ -9115,6 +9751,37 @@ msgstr "ne pas avertir à propos des conflits"
msgid "set labels for file1/orig-file/file2"
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "option inconnue %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "Impossible d'analyser l'objet '%s'"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "impossible de gérer plus de %d base. %s ignoré."
+msgstr[1] "impossible de gérer plus de %d bases. %s ignoré."
+
+#: builtin/merge-recursive.c:63
+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-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "impossible de résoudre la référence '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusion de %s avec %s\n"
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -9225,44 +9892,44 @@ msgstr "Renommage de %s en %s\n"
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
@@ -9397,8 +10064,8 @@ msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
+msgid "please supply the note contents using either -m or -F option"
+msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
#: builtin/notes.c:203
msgid "unable to write note object"
@@ -9406,8 +10073,8 @@ msgstr "impossible d'écrire l'objet note"
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
-msgstr "Le contenu de la note a été laissé dans %s"
+msgid "the note contents have been left in %s"
+msgstr "le contenu de la note a été laissé dans %s"
#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
@@ -9419,52 +10086,76 @@ msgstr "impossible de lire '%s'"
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "impossible de résoudre '%s' comme une référence valide."
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Impossible de lire l'objet '%s'."
+msgid "failed to read object '%s'."
+msgstr "impossible de lire l'objet '%s'."
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'."
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
+
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "ligne en entrée malformée : '%s'."
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "impossible de copier les notes de '%s' vers '%s'"
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
-msgstr "Pas de note trouvée pour l'objet %s."
+msgid "no note found for object %s."
+msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9473,30 +10164,30 @@ msgstr ""
"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:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9505,12 +10196,12 @@ msgstr ""
"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:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Notes manquantes sur l'objet source %s. Impossible de copier."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -9519,20 +10210,52 @@ msgstr ""
"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:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "échec de la suppression de la copie de travail 'git notes merge'"
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "échec de la résolution de NOTES_MERGE_REF"
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr "impossible de finaliser la fusion de notes"
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -9540,47 +10263,47 @@ msgstr ""
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
-msgstr "Vous devez spécifier une référence de notes à fusionner"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, 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"
+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:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+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)"
+"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -9591,239 +10314,235 @@ msgstr ""
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
"avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:899
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:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sous-commande inconnue : %s"
+msgid "unknown subcommand: %s"
+msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
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:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1037
+#: 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:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
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:2652
+#: builtin/pack-objects.c:2800
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:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
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:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
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:2667
+#: builtin/pack-objects.c:2815
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:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
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:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
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:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
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:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
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:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr "heure"
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
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:2716
+#: builtin/pack-objects.c:2864
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:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr "Décompte des objets"
@@ -9863,55 +10582,45 @@ msgstr "faire expirer les objets plus vieux que <heure>"
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valeur invalide pour %s : %s"
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "De plus, votre index contient des modifications non validées."
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"impossible de tirer avec rebasage : votre index contient des modifications "
-"non validées."
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9919,14 +10628,14 @@ msgstr ""
"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:465
+#: builtin/pull.c:399
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:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9934,7 +10643,7 @@ msgstr ""
"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:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9946,44 +10655,44 @@ msgstr ""
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9993,21 +10702,29 @@ msgstr ""
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:875
+#: builtin/pull.c:809
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:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "tirer avec un rebasage"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "veuillez les valider ou les remiser."
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -10018,7 +10735,7 @@ msgstr ""
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -10036,11 +10753,11 @@ msgstr ""
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
@@ -10433,15 +11150,65 @@ msgstr "sauter l'application du filtre d'extraction creuse"
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set 'receive.denyCurrentBranch' configuration variable to\n"
+"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"Par défaut, mettre à jour la branche actuelle dans un dépôt non-nu\n"
+"est réfusé parce que cela rendrait l'index et la copie de travail\n"
+"inconsistants avec ce que vous avez poussé et nécessiterait\n"
+"'git reset --hard' pour réaligner la copie de travail avec HEAD.\n"
+"\n"
+"Vous pouvez régler « receive.denyCurrentBranch » à 'ignore' ou\n"
+"'warn' dans le dépôt distant pour permettre la poussée dans la\n"
+"branche actuelle ; cependant, ce n'est pas recommandé à moins que\n"
+"vous ayez déjà mis à jour sa copie de travail par une moyen détourné\n"
+"pour correspondre à ce que vous avez poussé.\n"
+"\n"
+"Pour éliminer ce message et conserver le comportement par défaut,\n"
+"réglez « receive.denyCurrentBranch » à 'refuse'."
+
+#: builtin/receive-pack.c:813
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"Par défaut, supprimer la branche actuelle est refusé parce que le\n"
+"prochain 'git clone' n'extraira aucun fichier et causer de la confusion.\n"
+"\n"
+"Vous pouvez régler « receive.denyDeleteCurrent » à 'warn' ou 'ignore'\n"
+"dans le dépôt distant pour permettre la suppression la branche actuelle\n"
+"avec ou sans message d'avertissement.\n"
+"\n"
+"Pour éliminer ce message, réglez-le à 'refuse'."
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -10778,7 +11545,7 @@ msgstr "* distante %s"
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr "(pas d'URL)"
@@ -10817,7 +11584,7 @@ msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr " (statut non demandé)"
@@ -10831,140 +11598,145 @@ msgstr[1] " Branches locales configurées pour 'git pull' :"
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:1203
+#: builtin/remote.c:1202
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 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:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
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:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
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:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sous-commande inconnue : %s"
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
@@ -11153,8 +11925,8 @@ msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:27
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <arbre ou apparenté> [--] <chemins>..."
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
@@ -11276,27 +12048,27 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
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:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -11388,7 +12160,7 @@ msgstr "garder les validations redondantes, vides"
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -11562,72 +12334,128 @@ msgstr ""
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
+msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
+
+#: builtin/show-branch.c:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr "aucune référence correspond à %s"
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr "afficher <n> validations de plus après l'ancêtre commun"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr "afficher les références inaccessibles depuis toute autre référence"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr ""
"afficher seulement les validations qui ne sont pas sur la première branche"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
+"base"
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr "aucune branche spécifiée, et HEAD est invalide"
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr "--reflog requiert un nom de branche"
+
+#: builtin/show-branch.c:733
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
+msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
+
+#: builtin/show-branch.c:737
+#, c-format
+msgid "no such ref %s"
+msgstr "référence inexistante %s"
+
+#: builtin/show-branch.c:829
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "impossible de gérer plus de %d révision."
+msgstr[1] "impossible de gérer plus de %d révisions."
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' n'est pas une référence valide."
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "impossible de trouver le commit %s (%s)"
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -11695,12 +12523,12 @@ msgstr ""
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:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
@@ -11710,80 +12538,100 @@ msgstr "Nom de référence complet attendu, %s obtenu"
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, 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:368
+#: builtin/submodule--helper.c:373
#, 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:378
+#: builtin/submodule--helper.c:383
#, 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:385
+#: builtin/submodule--helper.c:390
#, 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:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, 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:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, 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:563
+#, 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:570
+#, 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:593
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr "forcer l'affichage de la progression du clonage"
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -11791,98 +12639,98 @@ msgstr ""
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, 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:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr "impossible de fermer le fichier %s"
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, 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:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, 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:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
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:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
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:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
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:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -11891,12 +12739,12 @@ msgstr ""
"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:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
"la sous-commande submodule--helper doit être appelée avec une sous-commande"
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -12133,7 +12981,7 @@ msgstr "l'étiquette '%s' existe déjà"
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
@@ -12204,135 +13052,151 @@ msgstr ""
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
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:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
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:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
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:977
+#: builtin/update-index.c:966
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:979
+#: builtin/update-index.c:968
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:981
+#: builtin/update-index.c:970
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:985
+#: builtin/update-index.c:974
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:989
+#: builtin/update-index.c:978
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:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
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:1014
+#: builtin/update-index.c:1003
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:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver le cache des fichiers non-suivis"
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment activer le cache des fichiers non-suivis"
+
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
@@ -12537,28 +13401,41 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr "Sortir immédiatement après l'annonce initiale des références"
-#: upload-pack.c:841
+#: upload-pack.c:1032
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:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfer après <n> secondes d'inactivité"
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Les permissions de votre répertoire de socket sont trop permissives ;\n"
+"les autres utilisateurs pourraient lire vos identifiants secrets. Lancez :\n"
+"\n"
+" chmod 0700 %s"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
@@ -12573,7 +13450,11 @@ msgstr ""
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:323
+#: http.c:342
+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:351
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"
@@ -12693,15 +13574,15 @@ msgstr "date-d'expiration"
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
@@ -12927,7 +13808,7 @@ msgid "Automated merge did not work."
msgstr "La fusion automatique a échoué."
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr "L'Octopus ne devrait pas arriver."
#: git-merge-octopus.sh:73
@@ -13117,6 +13998,10 @@ msgstr "Vous n'avez pas encore la validation initiale"
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr "Impossible de sauver les fichiers non-suivis"
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
@@ -13157,6 +14042,11 @@ msgstr ""
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
+#: git-stash.sh:251
+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:259
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
@@ -13178,98 +14068,102 @@ msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr "Impossible de restaurer les fichiers non-suivis depuis le remisage"
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr "Le remisage est conservé au cas où vous en auriez encore besoin."
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -13280,24 +14174,24 @@ msgstr ""
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -13314,48 +14208,48 @@ msgstr ""
"correct\n"
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Entrée dans '$displaypath'"
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "un spécificateur de chemin et --all sont incompatibles"
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -13366,7 +14260,7 @@ msgstr ""
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -13375,42 +14269,42 @@ msgstr ""
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, 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:622
+#: git-submodule.sh:627
#, 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:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -13419,12 +14313,12 @@ msgstr ""
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -13433,92 +14327,88 @@ msgstr ""
"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:658
+#: git-submodule.sh:663
#, 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:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, 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:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, 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:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, 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:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:815
+#: git-submodule.sh:820
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:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, 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:890
+#: git-submodule.sh:895
#, 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:893
+#: git-submodule.sh:898
#, 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:918
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
@@ -13686,7 +14576,7 @@ msgid ""
msgstr ""
"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
"$rest\n"
-"C'est probablement du à un message de validation vide ou le crochet pre-"
+"C'est probablement dû à un message de validation vide ou le crochet pre-"
"commit\n"
"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
"le\n"
@@ -13815,8 +14705,12 @@ msgstr ""
"Ignoré."
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
-msgstr "Vous pouvez corriger ceci avec 'git rebase --edit-todo'."
+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:1045
msgid "Or you can abort the rebase with 'git rebase --abort'."
@@ -13839,7 +14733,7 @@ msgid ""
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
@@ -13889,44 +14783,40 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr "Vous devez d'abord définir vos informations de validateur"
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, 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:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -13936,7 +14826,7 @@ msgstr ""
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
@@ -13967,6 +14857,11 @@ msgstr ""
"Impossible de réécrire les branches : vous avez des modifications non "
"indexées."
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
@@ -13977,12 +14872,22 @@ msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"Impossible de rebaser : votre index contient des modifications non validées."
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"impossible de tirer avec rebasage : votre index contient des modifications "
+"non validées."
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"$action est impossible : votre index contient des modifications non validées."
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "De plus, votre index contient des modifications non validées."
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
@@ -13992,6 +14897,42 @@ msgstr ""
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
+#~ msgid "Could not write to %s"
+#~ msgstr "Impossible d'écrire dans %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "Erreur lors de l'emballage de %s."
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "Vos modifications locales seraient écrasées par cherry-pick."
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr "Impossible de picorer pendant un autre picorage."
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "Impossible d'analyser la ligne %d."
+
+#~ msgid "Could not open %s"
+#~ msgstr "Impossible d'ouvrir %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "Impossible de lire %s."
+
+#~ msgid "Could not format %s."
+#~ msgstr "Impossible de formater %s."
+
+#~ msgid "%s: %s"
+#~ msgstr "%s : %s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "impossible d'ouvrir %s : %s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Vous devez d'abord définir vos informations de validateur"
+
#~ msgid "This is the 2nd commit message:"
#~ msgstr "Ceci est le deuxième message de validation :"
@@ -14136,9 +15077,6 @@ msgstr "Impossible de déterminer le chemin absolu du répertoire git"
#~ msgid "Verify that the named commit has a valid GPG signature"
#~ msgstr "Vérifier que la validation a une signature GPG valide"
-#~ msgid "Could not write to '%s'"
-#~ msgstr "Impossible d'écrire dans '%s'"
-
#~ msgid "Writing SQUASH_MSG"
#~ msgstr "Écriture de SQUASH_MSG"
diff --git a/po/git.pot b/po/git.pot
index fed61cf..19bccb4 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,6 +86,608 @@ msgid ""
"\n"
msgstr ""
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr ""
+
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr ""
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr ""
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr ""
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr ""
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr ""
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr ""
+
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr ""
+
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr ""
+
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr ""
+
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr ""
+
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr ""
+
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr ""
+
+#: apply.c:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr ""
+
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr ""
+
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr ""
+
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr ""
+
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr ""
+
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr ""
+
+#: apply.c:1984
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr ""
+
+#: apply.c:2021
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr ""
+
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr ""
+
+#: apply.c:2274
+#, c-format
+msgid "unable to read symlink %s"
+msgstr ""
+
+#: apply.c:2278
+#, c-format
+msgid "unable to open or read %s"
+msgstr ""
+
+#: apply.c:2931
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr ""
+
+#: apply.c:3050
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:3062
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+
+#: apply.c:3068
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+
+#: apply.c:3090
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr ""
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+
+#: apply.c:3144
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+
+#: apply.c:3154
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+
+#: apply.c:3162
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr ""
+
+#: apply.c:3180
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr ""
+
+#: apply.c:3193
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr ""
+
+#: apply.c:3199
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr ""
+
+#: apply.c:3342
+#, c-format
+msgid "cannot checkout %s"
+msgstr ""
+
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr ""
+
+#: apply.c:3398
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
+
+#: apply.c:3427 apply.c:3667
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr ""
+
+#: apply.c:3510 apply.c:3681
+#, c-format
+msgid "%s: does not exist in index"
+msgstr ""
+
+#: apply.c:3519 apply.c:3689
+#, c-format
+msgid "%s: does not match index"
+msgstr ""
+
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+
+#: apply.c:3557
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr ""
+
+#: apply.c:3573 apply.c:3577
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr ""
+
+#: apply.c:3589
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr ""
+
+#: apply.c:3603
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr ""
+
+#: apply.c:3608
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr ""
+
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr ""
+
+#: apply.c:3706
+#, c-format
+msgid "%s: wrong type"
+msgstr ""
+
+#: apply.c:3708
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr ""
+
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr ""
+
+#: apply.c:3917
+#, c-format
+msgid "%s: already exists in index"
+msgstr ""
+
+#: apply.c:3920
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr ""
+
+#: apply.c:3940
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr ""
+
+#: apply.c:3945
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr ""
+
+#: apply.c:3965
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr ""
+
+#: apply.c:3969
+#, c-format
+msgid "%s: patch does not apply"
+msgstr ""
+
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr ""
+
+#: apply.c:4075
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr ""
+
+#: apply.c:4082
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr ""
+
+#: apply.c:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr ""
+
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr ""
+
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr ""
+
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr ""
+
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr ""
+
+#: apply.c:4277
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr ""
+
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr ""
+
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr ""
+
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr ""
+
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr ""
+
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr ""
+
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr ""
+
+#: apply.c:4518
+msgid "internal error"
+msgstr ""
+
+#: apply.c:4521
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ""
+
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr ""
+
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr ""
+
+#: apply.c:4668
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr ""
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr ""
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr ""
+
+#: apply.c:4858
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4864 apply.c:4879
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4872
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr ""
+
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr ""
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr ""
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr ""
+
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr ""
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr ""
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr ""
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr ""
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr ""
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr ""
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr ""
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr ""
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr ""
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr ""
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr ""
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr ""
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
@@ -103,7 +705,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
@@ -116,7 +718,7 @@ msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:430 builtin/log.c:1422
+#: archive.c:430 builtin/log.c:1429
msgid "prefix"
msgstr ""
@@ -124,11 +726,11 @@ msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
-#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
-#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr ""
@@ -160,8 +762,8 @@ msgstr ""
msgid "list supported archive formats"
msgstr ""
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
msgid "repo"
msgstr ""
@@ -169,7 +771,7 @@ msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr ""
@@ -413,27 +1015,27 @@ msgid ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:266
+#: branch.c:265
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:286
+#: branch.c:285
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:291
+#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:345
+#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:364
+#: branch.c:363
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
@@ -448,7 +1050,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 builtin/commit.c:778
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -457,9 +1059,9 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr ""
@@ -499,7 +1101,7 @@ msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -522,8 +1124,8 @@ msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -533,6 +1135,13 @@ msgstr ""
msgid "%s %s is not a commit!"
msgstr ""
+#: commit.c:1514
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
@@ -615,7 +1224,7 @@ msgstr ""
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:849 config.c:860
+#: config.c:852 config.c:863
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
@@ -658,22 +1267,58 @@ msgstr ""
msgid "could not unset '%s'"
msgstr ""
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr ""
+
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
msgid "Checking connectivity"
msgstr ""
-#: connected.c:74
+#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:94
+#: connected.c:95
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:101
+#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr ""
+#: convert.c:201
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr ""
+
+#: convert.c:211
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+
+#: convert.c:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
#: date.c:97
msgid "in the future"
msgstr ""
@@ -747,131 +1392,321 @@ msgstr[1] ""
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:540
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:116
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr ""
+
+#: diff.c:124
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:121
+#: diff.c:129
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:225
+#: diff.c:283
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:277
+#: diff.c:346
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3017
+#: diff.c:3087
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3415
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr ""
+
+#: diff.c:3502
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3578
+#: diff.c:3665
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3592
+#: diff.c:3679
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: dir.c:1823
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+
+#: diff.c:4706
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+
+#: dir.c:1866
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:1942
+#: dir.c:1985
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: gpg-interface.c:178
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr ""
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr ""
+
+#: fetch-pack.c:243
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr ""
+
+#: fetch-pack.c:381
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:387
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
+msgstr ""
+
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
+msgstr ""
+
+#: fetch-pack.c:394
+#, c-format
+msgid "no shallow found: %s"
+msgstr ""
+
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr ""
+
+#: fetch-pack.c:436
+#, c-format
+msgid "got %s %d %s"
+msgstr ""
+
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr ""
+
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr ""
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr ""
+
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
+msgstr ""
+
+#: fetch-pack.c:551
+#, c-format
+msgid "Marking %s as complete"
+msgstr ""
+
+#: fetch-pack.c:697
+#, c-format
+msgid "already have %s (%s)"
+msgstr ""
+
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr ""
+
+#: fetch-pack.c:799
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr ""
+
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr ""
+
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr ""
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr ""
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr ""
+
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
+msgstr ""
+
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
+msgstr ""
+
+#: fetch-pack.c:865
+msgid "Server supports side-band"
+msgstr ""
+
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr ""
+
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr ""
+
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
+msgstr ""
+
+#: fetch-pack.c:890
+#, c-format
+msgid "Server version is %.*s"
+msgstr ""
+
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
+msgstr ""
+
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
+msgstr ""
+
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
+msgstr ""
+
+#: fetch-pack.c:913
+msgid "no common commits"
+msgstr ""
+
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr ""
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr ""
+
+#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:208
+#: gpg-interface.c:215
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:210
+#: gpg-interface.c:217
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
-#: grep.c:1792
+#: grep.c:1782
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1820
+#: grep.c:1810
#, c-format
msgid "'%s': short read"
msgstr ""
-#: help.c:205
+#: help.c:203
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:212
+#: help.c:210
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:244
+#: help.c:241
msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:309
+#: help.c:306
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:366
+#: help.c:361
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:388
+#: help.c:383
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-#: help.c:393
+#: help.c:388
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:400
+#: help.c:395
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:404 help.c:470
+#: help.c:399 help.c:465
msgid ""
"\n"
"Did you mean this?"
@@ -881,11 +1716,26 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: help.c:466
+#: help.c:461
#, c-format
msgid "%s: %s - %s"
msgstr ""
+#: ident.c:334
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -907,8 +1757,8 @@ msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
msgid "unable to write new index file"
msgstr ""
@@ -944,7 +1794,7 @@ msgstr ""
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:796
+#: merge-recursive.c:796 builtin/cat-file.c:34
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
@@ -1077,7 +1927,7 @@ msgstr ""
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1736 git-submodule.sh:919
+#: merge-recursive.c:1736 git-submodule.sh:924
msgid "submodule"
msgstr ""
@@ -1142,6 +1992,19 @@ msgstr ""
msgid "Unable to write index."
msgstr ""
+#: notes-merge.c:273
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
+msgstr ""
+
+#: notes-merge.c:280
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr ""
+
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
@@ -1198,7 +2061,7 @@ msgstr ""
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:798
+#: path.c:826
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
@@ -1252,55 +2115,57 @@ msgstr ""
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:433
+#: pathspec.c:408
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+
+#: pathspec.c:440
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:442
+#: pathspec.c:449
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#: pretty.c:973
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr ""
-#: progress.c:235
-msgid "done"
-msgstr ""
-
-#: read-cache.c:1281
+#: read-cache.c:1315
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1291
+#: read-cache.c:1325
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: refs.c:551 builtin/merge.c:840
+#: refs.c:576 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs/files-backend.c:2534
+#: refs/files-backend.c:2481
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:2537
+#: refs/files-backend.c:2484
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: refs/files-backend.c:2546
+#: refs/files-backend.c:2493
#, c-format
msgid "could not remove reference %s"
msgstr ""
@@ -1429,12 +2294,12 @@ msgstr ""
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:1651
+#: ref-filter.c:1633
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:1705
+#: ref-filter.c:1687
#, c-format
msgid "malformed object name %s"
msgstr ""
@@ -1552,285 +2417,308 @@ msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2132
+#: revision.c:2158
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2135
+#: revision.c:2161
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2329
+#: revision.c:2355
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: run-command.c:92
+#: run-command.c:106
msgid "open /dev/null failed"
msgstr ""
-#: run-command.c:94
+#: run-command.c:108
#, c-format
msgid "dup2(%d,%d) failed"
msgstr ""
-#: send-pack.c:298
+#: send-pack.c:297
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:411
+#: send-pack.c:410
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:413
+#: send-pack.c:412
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:425
+#: send-pack.c:424
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:430
+#: send-pack.c:429
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:174
+#: sequencer.c:171
+msgid "revert"
+msgstr ""
+
+#: sequencer.c:171
+msgid "cherry-pick"
+msgstr ""
+
+#: sequencer.c:228
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:177
+#: sequencer.c:231
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: sequencer.c:244 sequencer.c:1209
#, c-format
-msgid "Could not write to %s"
+msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
#, c-format
-msgid "Error wrapping up %s."
+msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
+#: sequencer.c:251
+#, c-format
+msgid "could not write eol to '%s"
msgstr ""
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
+#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#, c-format
+msgid "failed to finalize '%s'."
msgstr ""
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
+#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#, c-format
+msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:228
+#: sequencer.c:305
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr ""
+
+#: sequencer.c:309
+msgid "commit your changes or stash them to proceed."
+msgstr ""
+
+#: sequencer.c:324
#, c-format
msgid "%s: fast-forward"
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: sequencer.c:399
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
+#: sequencer.c:418
+msgid "could not resolve HEAD commit\n"
+msgstr ""
+
+#: sequencer.c:438
+msgid "unable to update cache tree\n"
msgstr ""
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
+#: sequencer.c:483
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: sequencer.c:393
+#: sequencer.c:567
#, c-format
-msgid "Could not parse commit %s\n"
+msgid "could not parse commit %s\n"
msgstr ""
-#: sequencer.c:398
+#: sequencer.c:572
#, c-format
-msgid "Could not parse parent commit %s\n"
+msgid "could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:463
-msgid "Your index file is unmerged."
+#: sequencer.c:656
+msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:482
+#: sequencer.c:675
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:490
+#: sequencer.c:683
#, c-format
-msgid "Commit %s does not have parent %d"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:494
+#: sequencer.c:687
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:700
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:511
+#: sequencer.c:705
#, c-format
-msgid "Cannot get commit message for %s"
+msgid "cannot get commit message for %s"
msgstr ""
-#: sequencer.c:597
+#: sequencer.c:797
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:598
+#: sequencer.c:798
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:633
+#: sequencer.c:833
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:641
+#: sequencer.c:843
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:645
+#: sequencer.c:850
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
-msgstr ""
-
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
-msgstr ""
-
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
+#: sequencer.c:944
+#, c-format
+msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
+#: sequencer.c:950
+msgid "no commits parsed."
msgstr ""
-#: sequencer.c:732
+#: sequencer.c:966
#, c-format
-msgid "Could not parse line %d."
+msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:737
-msgid "No commits parsed."
-msgstr ""
-
-#: sequencer.c:749
+#: sequencer.c:972
#, c-format
-msgid "Could not open %s"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:753
-#, c-format
-msgid "Could not read %s."
+#: sequencer.c:983
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:760
-#, c-format
-msgid "Unusable instruction sheet: %s"
+#: sequencer.c:985
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:790
+#: sequencer.c:1028
#, c-format
-msgid "Invalid key: %s"
+msgid "invalid key: %s"
msgstr ""
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:1031
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:803
+#: sequencer.c:1063
#, c-format
-msgid "Malformed options sheet: %s"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:822
+#: sequencer.c:1101
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:823
+#: sequencer.c:1102
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:827
+#: sequencer.c:1106
#, c-format
-msgid "Could not create sequencer directory %s"
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:1120
+msgid "could not lock HEAD"
+msgstr ""
+
+#: sequencer.c:1151 sequencer.c:1289
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:864
+#: sequencer.c:1153
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:866 sequencer.c:900
+#: sequencer.c:1155 sequencer.c:1189
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: sequencer.c:1175 builtin/grep.c:578
#, c-format
-msgid "cannot open %s"
+msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:888
+#: sequencer.c:1177
#, c-format
-msgid "cannot read %s: %s"
+msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:889
+#: sequencer.c:1178
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:895
+#: sequencer.c:1184
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:921
-#, c-format
-msgid "Could not format %s."
-msgstr ""
-
-#: sequencer.c:1066
+#: sequencer.c:1354
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1069
+#: sequencer.c:1358
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
+#: sequencer.c:1391
+msgid "can't revert as initial commit"
msgstr ""
#: setup.c:160
@@ -1856,11 +2744,6 @@ msgid ""
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
-#, c-format
-msgid "failed to read %s"
-msgstr ""
-
#: setup.c:468
#, c-format
msgid "Expected git repo version <= %d, found %d"
@@ -1902,21 +2785,55 @@ msgid ""
"The owner of files must always have read and write permissions."
msgstr ""
-#: sha1_file.c:1046
+#: sha1_file.c:473
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: sha1_file.c:499
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: sha1_file.c:505
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: sha1_file.c:511
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: sha1_file.c:519
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: sha1_file.c:1159
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: sha1_file.c:2434
+#: sha1_file.c:2592
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: sha1_file.c:2438
+#: sha1_file.c:2596
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: sha1_name.c:462
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr ""
+
+#: sha1_name.c:418
+msgid "The candidates are:"
+msgstr ""
+
+#: sha1_name.c:578
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1952,7 +2869,7 @@ msgstr ""
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:177
+#: submodule.c:158
msgid "negative values not allowed for submodule.fetchJobs"
msgstr ""
@@ -1961,56 +2878,56 @@ msgstr ""
msgid "invalid value for %s"
msgstr ""
-#: trailer.c:237
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr ""
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
+#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
+#: trailer.c:541
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
+#: trailer.c:523 trailer.c:528 builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr ""
-#: trailer.c:582
+#: trailer.c:672
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: trailer.c:702
+#: trailer.c:695
#, c-format
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:705
+#: trailer.c:698
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:857 builtin/am.c:42
+#: trailer.c:929 builtin/am.c:44
#, c-format
msgid "could not stat %s"
msgstr ""
-#: trailer.c:859
+#: trailer.c:931
#, c-format
msgid "file %s is not a regular file"
msgstr ""
-#: trailer.c:861
+#: trailer.c:933
#, c-format
msgid "file %s is not writable by user"
msgstr ""
-#: trailer.c:873
+#: trailer.c:945
msgid "could not open temporary file"
msgstr ""
-#: trailer.c:912
+#: trailer.c:983
#, c-format
msgid "could not rename temporary file to %s"
msgstr ""
@@ -2025,14 +2942,14 @@ msgstr ""
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:771
+#: transport.c:817
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:775
+#: transport.c:821
#, c-format
msgid ""
"\n"
@@ -2048,15 +2965,31 @@ msgid ""
"\n"
msgstr ""
-#: transport.c:783
+#: transport.c:829
msgid "Aborting."
msgstr ""
-#: transport-helper.c:1041
+#: transport-helper.c:1075
#, c-format
msgid "Could not read ref %s"
msgstr ""
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr ""
+
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr ""
+
#: unpack-trees.c:64
#, c-format
msgid ""
@@ -2207,7 +3140,7 @@ msgstr ""
#: unpack-trees.c:126
#, c-format
msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
+"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
@@ -2215,7 +3148,7 @@ msgstr ""
#: unpack-trees.c:128
#, c-format
msgid ""
-"The following Working tree files would be removed by sparse checkout "
+"The following working tree files would be removed by sparse checkout "
"update:\n"
"%s"
msgstr ""
@@ -2268,14 +3201,14 @@ msgstr ""
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
@@ -2299,359 +3232,359 @@ msgstr ""
msgid "could not close %s"
msgstr ""
-#: wt-status.c:150
+#: wt-status.c:151
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:183
+#: wt-status.c:184
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:187
+#: wt-status.c:188
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:198 wt-status.c:882
+#: wt-status.c:199 wt-status.c:945
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:216 wt-status.c:891
+#: wt-status.c:217 wt-status.c:954
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:220
+#: wt-status.c:221
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:222
+#: wt-status.c:223
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:223
+#: wt-status.c:224
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:225
+#: wt-status.c:226
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:237
+#: wt-status.c:238
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:252
+#: wt-status.c:253
msgid "both deleted:"
msgstr ""
-#: wt-status.c:254
+#: wt-status.c:255
msgid "added by us:"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:257
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:258
+#: wt-status.c:259
msgid "added by them:"
msgstr ""
-#: wt-status.c:260
+#: wt-status.c:261
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:262
+#: wt-status.c:263
msgid "both added:"
msgstr ""
-#: wt-status.c:264
+#: wt-status.c:265
msgid "both modified:"
msgstr ""
-#: wt-status.c:274
+#: wt-status.c:275
msgid "new file:"
msgstr ""
-#: wt-status.c:276
+#: wt-status.c:277
msgid "copied:"
msgstr ""
-#: wt-status.c:278
+#: wt-status.c:279
msgid "deleted:"
msgstr ""
-#: wt-status.c:280
+#: wt-status.c:281
msgid "modified:"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:283
msgid "renamed:"
msgstr ""
-#: wt-status.c:284
+#: wt-status.c:285
msgid "typechange:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:287
msgid "unknown:"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:289
msgid "unmerged:"
msgstr ""
-#: wt-status.c:370
+#: wt-status.c:371
msgid "new commits, "
msgstr ""
-#: wt-status.c:372
+#: wt-status.c:373
msgid "modified content, "
msgstr ""
-#: wt-status.c:374
+#: wt-status.c:375
msgid "untracked content, "
msgstr ""
-#: wt-status.c:756
+#: wt-status.c:818
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:758
+#: wt-status.c:820
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:839
+#: wt-status.c:901
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-#: wt-status.c:950
+#: wt-status.c:1013
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:953
+#: wt-status.c:1016
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:955
+#: wt-status.c:1018
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:960
+#: wt-status.c:1023
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:963
+#: wt-status.c:1026
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:973
+#: wt-status.c:1036
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:976
+#: wt-status.c:1039
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:980
+#: wt-status.c:1043
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:982
+#: wt-status.c:1045
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:984
+#: wt-status.c:1047
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1109
+#: wt-status.c:1172
msgid "No commands done."
msgstr ""
-#: wt-status.c:1112
+#: wt-status.c:1175
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1123
+#: wt-status.c:1186
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1128
+#: wt-status.c:1191
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1131
+#: wt-status.c:1194
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1139
+#: wt-status.c:1202
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1152
+#: wt-status.c:1215
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1157
+#: wt-status.c:1220
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1171
+#: wt-status.c:1234
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1173
+#: wt-status.c:1236
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1175
+#: wt-status.c:1238
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1181
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1185
+#: wt-status.c:1248
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1190
+#: wt-status.c:1253
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1193
+#: wt-status.c:1256
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1197
+#: wt-status.c:1260
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1202
+#: wt-status.c:1265
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1205
+#: wt-status.c:1268
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1207
+#: wt-status.c:1270
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1217
+#: wt-status.c:1280
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1222
+#: wt-status.c:1285
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1225
+#: wt-status.c:1288
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1227
+#: wt-status.c:1290
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1236
+#: wt-status.c:1299
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1241
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1244
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1246
+#: wt-status.c:1309
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1257
+#: wt-status.c:1320
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1261
+#: wt-status.c:1324
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1264
+#: wt-status.c:1327
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1464
+#: wt-status.c:1524
msgid "On branch "
msgstr ""
-#: wt-status.c:1470
+#: wt-status.c:1530
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1472
+#: wt-status.c:1532
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1477
+#: wt-status.c:1537
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1479
+#: wt-status.c:1539
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1482
+#: wt-status.c:1542
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1500
+#: wt-status.c:1560
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1514
+#: wt-status.c:1574
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1516
+#: wt-status.c:1576
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1520
+#: wt-status.c:1580
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2659,82 +3592,97 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1526
+#: wt-status.c:1586
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1528
+#: wt-status.c:1588
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1534
+#: wt-status.c:1594
msgid "No changes"
msgstr ""
-#: wt-status.c:1539
+#: wt-status.c:1599
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1542
+#: wt-status.c:1602
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1545
+#: wt-status.c:1605
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1548
+#: wt-status.c:1608
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1551
+#: wt-status.c:1611
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1554 wt-status.c:1559
+#: wt-status.c:1614 wt-status.c:1619
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1557
+#: wt-status.c:1617
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1561
+#: wt-status.c:1621
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1668
+#: wt-status.c:1728
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1672
+#: wt-status.c:1732
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1701
+#: wt-status.c:1761
msgid "gone"
msgstr ""
-#: wt-status.c:1703 wt-status.c:1711
+#: wt-status.c:1763 wt-status.c:1771
msgid "behind "
msgstr ""
-#: wt-status.c:1706 wt-status.c:1709
+#: wt-status.c:1766 wt-status.c:1769
msgid "ahead "
msgstr ""
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2270
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr ""
+
+#: wt-status.c:2276
+msgid "additionally, your index contains uncommitted changes."
+msgstr ""
+
+#: wt-status.c:2278
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr ""
+
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -2743,306 +3691,291 @@ msgstr ""
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:65
+#: builtin/add.c:80
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:71 builtin/commit.c:281
+#: builtin/add.c:85 builtin/commit.c:291
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:81
+#: builtin/add.c:95
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:136
+#: builtin/add.c:149
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:196 builtin/rev-parse.c:811
+#: builtin/add.c:209 builtin/rev-parse.c:840
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:207
+#: builtin/add.c:220
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:211
+#: builtin/add.c:224
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:214
+#: builtin/add.c:227
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:217
+#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:219
+#: builtin/add.c:232
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:224
+#: builtin/add.c:237
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:234
+#: builtin/add.c:247
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
+#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr ""
-
-#: builtin/add.c:256
+#: builtin/add.c:269
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:258
+#: builtin/add.c:271
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:259
+#: builtin/add.c:272
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:260
+#: builtin/add.c:273
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:261
+#: builtin/add.c:274
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:262
+#: builtin/add.c:275
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:265
+#: builtin/add.c:278
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:267
+#: builtin/add.c:280
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:268
+#: builtin/add.c:281
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:269
+#: builtin/add.c:282
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:270 builtin/update-index.c:958
+#: builtin/add.c:283 builtin/update-index.c:947
msgid "(+/-)x"
msgstr ""
-#: builtin/add.c:270 builtin/update-index.c:959
+#: builtin/add.c:283 builtin/update-index.c:948
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:292
+#: builtin/add.c:305
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:300
+#: builtin/add.c:312
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:336
+#: builtin/add.c:348
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:343
+#: builtin/add.c:355
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:352
+#: builtin/add.c:359
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:367
+#: builtin/add.c:374
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:368
+#: builtin/add.c:375
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
+#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
-msgstr ""
-
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
-msgstr ""
-
-#: builtin/am.c:426
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:503
+#: builtin/am.c:491
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:544 builtin/notes.c:301
+#: builtin/am.c:532
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:581 builtin/notes.c:316
+#: builtin/am.c:569
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:607
+#: builtin/am.c:595
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:787
+#: builtin/am.c:775
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:852
+#: builtin/am.c:840
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:899
+#: builtin/am.c:887
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:902 builtin/am.c:910
+#: builtin/am.c:890 builtin/am.c:898
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:907
+#: builtin/am.c:895
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:996
+#: builtin/am.c:984
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:1001 builtin/clone.c:380
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:1005
+#: builtin/am.c:993
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1137 builtin/commit.c:366
+#: builtin/am.c:1125 builtin/commit.c:376
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1188
+#: builtin/am.c:1176
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1189
+#: builtin/am.c:1177
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1190
+#: builtin/am.c:1178
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1328
+#: builtin/am.c:1316
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1402 builtin/log.c:1543
+#: builtin/am.c:1390 builtin/log.c:1550
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/am.c:1429
+#: builtin/am.c:1417
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1602
+#: builtin/am.c:1610
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1604
+#: builtin/am.c:1612
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1623
+#: builtin/am.c:1631
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1629
+#: builtin/am.c:1637
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1654
+#: builtin/am.c:1662
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1679 builtin/merge.c:628
+#: builtin/am.c:1686 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1686
+#: builtin/am.c:1693
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1731 builtin/am.c:1735
+#: builtin/am.c:1739 builtin/am.c:1743
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1751
+#: builtin/am.c:1759
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1756
+#: builtin/am.c:1764
msgid "Commit Body is:"
msgstr ""
@@ -3050,707 +3983,219 @@ msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1766
+#: builtin/am.c:1774
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1816
+#: builtin/am.c:1824
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1853 builtin/am.c:1925
+#: builtin/am.c:1861 builtin/am.c:1933
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1869
+#: builtin/am.c:1877
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1877
+#: builtin/am.c:1885
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1883
+#: builtin/am.c:1891
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1928
+#: builtin/am.c:1936
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1935
+#: builtin/am.c:1943
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2095
+#: builtin/am.c:2103
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2129
+#: builtin/am.c:2137
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2192
+#: builtin/am.c:2200
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2226
+#: builtin/am.c:2234
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2240
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2242
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2236
+#: builtin/am.c:2244
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:172
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2239
+#: builtin/am.c:2247
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2242
+#: builtin/am.c:2250
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2252
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2246
+#: builtin/am.c:2254
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2248
+#: builtin/am.c:2256
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2258
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2253
+#: builtin/am.c:2261
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2256
+#: builtin/am.c:2264
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
-msgstr ""
-
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
-msgstr ""
-
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
-msgstr ""
-
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
+#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr ""
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
-msgstr ""
-
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr ""
-#: builtin/am.c:2282
+#: builtin/am.c:2290
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2288
+#: builtin/am.c:2296
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2298
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2293
+#: builtin/am.c:2301
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2304
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2299
+#: builtin/am.c:2307
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2303
+#: builtin/am.c:2311
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2305
+#: builtin/am.c:2313
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr ""
-#: builtin/am.c:2308
+#: builtin/am.c:2316
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2311
+#: builtin/am.c:2319
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2326
+#: builtin/am.c:2334
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2333
+#: builtin/am.c:2341
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2348
+#: builtin/am.c:2356
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2372
+#: builtin/am.c:2380
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2378
+#: builtin/am.c:2386
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/apply.c:122
+#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/apply.c:153
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr ""
-
-#: builtin/apply.c:169
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr ""
-
-#: builtin/apply.c:854
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
-
-#: builtin/apply.c:863
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr ""
-
-#: builtin/apply.c:947
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr ""
-
-#: builtin/apply.c:984
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
-
-#: builtin/apply.c:989
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-
-#: builtin/apply.c:990
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr ""
-
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr ""
-
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr ""
-
-#: builtin/apply.c:1550
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
-
-#: builtin/apply.c:1567
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
-msgstr ""
-
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
-msgstr ""
-
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr ""
-
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr ""
-
-#: builtin/apply.c:1812
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr ""
-
-#: builtin/apply.c:1815
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr ""
-
-#: builtin/apply.c:1962
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr ""
-
-#: builtin/apply.c:1999
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr ""
-
-#: builtin/apply.c:2154
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr ""
-
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
-msgstr ""
-
-#: builtin/apply.c:2248
-#, c-format
-msgid "unable to open or read %s"
-msgstr ""
-
-#: builtin/apply.c:2901
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr ""
-
-#: builtin/apply.c:3020
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:3032
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
-
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr ""
-
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr ""
-
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr ""
-
-#: builtin/apply.c:3314
-#, c-format
-msgid "cannot checkout %s"
-msgstr ""
-
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr ""
-
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr ""
-
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
-msgstr ""
-
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: builtin/apply.c:3491 builtin/apply.c:3652
-#, c-format
-msgid "%s: does not match index"
-msgstr ""
-
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
-msgstr ""
-
-#: builtin/apply.c:3669
-#, c-format
-msgid "%s: wrong type"
-msgstr ""
-
-#: builtin/apply.c:3671
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr ""
-
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
-msgstr ""
-
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
-msgstr ""
-
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr ""
-
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
-
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
-
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr ""
-
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
-msgstr ""
-
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
-msgstr ""
-
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr ""
-
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
-msgstr ""
-
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr ""
-
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr ""
-
-#: builtin/apply.c:4224
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr ""
-
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr ""
-
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
-msgstr ""
-
-#: builtin/apply.c:4313
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr ""
-
-#: builtin/apply.c:4403
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr ""
-
-#: builtin/apply.c:4411
-msgid "internal error"
-msgstr ""
-
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:4424
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
-
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
-msgstr ""
-
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr ""
-
-#: builtin/apply.c:4448
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr ""
-
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr ""
-
-#: builtin/apply.c:4545
-msgid "unrecognized input"
-msgstr ""
-
-#: builtin/apply.c:4556
-msgid "unable to read index file"
-msgstr ""
-
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
-msgstr ""
-
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
-msgstr ""
-
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
-msgstr ""
-
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
-msgstr ""
-
-#: builtin/apply.c:4760
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:4766 builtin/apply.c:4776
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
-msgstr ""
-
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
-msgstr ""
-
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
-msgstr ""
-
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
-
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
-
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
-
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
-
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
-msgstr ""
-
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
-msgstr ""
-
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
-msgstr ""
-
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
-
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
-msgstr ""
-
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
-msgstr ""
-
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
-msgstr ""
-
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
-
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
-msgstr ""
-
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
-msgstr ""
-
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
-msgstr ""
-
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr ""
-
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
-msgstr ""
-
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
-
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
-msgstr ""
-
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
-msgstr ""
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3810,112 +4255,158 @@ msgstr ""
msgid "Blaming lines"
msgstr ""
-#: builtin/blame.c:2536
+#: builtin/blame.c:2577
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2537
+#: builtin/blame.c:2578
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2538
+#: builtin/blame.c:2579
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2539
+#: builtin/blame.c:2580
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2540
+#: builtin/blame.c:2581
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:2541
+#: builtin/blame.c:2582
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2542
+#: builtin/blame.c:2583
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2543
+#: builtin/blame.c:2584
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2544
+#: builtin/blame.c:2585
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2545
+#: builtin/blame.c:2586
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2546
+#: builtin/blame.c:2587
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2547
+#: builtin/blame.c:2588
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2548
+#: builtin/blame.c:2589
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2549
+#: builtin/blame.c:2590
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2550
+#: builtin/blame.c:2591
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2551
+#: builtin/blame.c:2592
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2552
+#: builtin/blame.c:2599
+msgid "Use an experimental indent-based heuristic to improve diffs"
+msgstr ""
+
+#: builtin/blame.c:2600
+msgid "Use an experimental blank-line-based heuristic to improve diffs"
+msgstr ""
+
+#: builtin/blame.c:2602
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2553
+#: builtin/blame.c:2603
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2554
+#: builtin/blame.c:2604
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2555 builtin/blame.c:2556
+#: builtin/blame.c:2605 builtin/blame.c:2606
msgid "score"
msgstr ""
-#: builtin/blame.c:2555
+#: builtin/blame.c:2605
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2556
+#: builtin/blame.c:2606
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2557
+#: builtin/blame.c:2607
msgid "Process only line range n,m, counting from 1"
msgstr ""
+#: builtin/blame.c:2654
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+
#. TRANSLATORS: This string is used to tell us the maximum
#. display width for a relative timestamp in "git blame"
#. output. For C locale, "4 years, 11 months ago", which
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2649
+#: builtin/blame.c:2700
msgid "4 years, 11 months ago"
msgstr ""
+#: builtin/blame.c:2780
+msgid "--contents and --reverse do not blend well."
+msgstr ""
+
+#: builtin/blame.c:2800
+msgid "cannot use --contents with final commit object name"
+msgstr ""
+
+#: builtin/blame.c:2805
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+
+#: builtin/blame.c:2832
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+
+#: builtin/blame.c:2843
+#, c-format
+msgid "no such path %s in %s"
+msgstr ""
+
+#: builtin/blame.c:2854
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr ""
+
+#: builtin/blame.c:2873
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
@@ -4154,6 +4645,10 @@ msgstr ""
msgid "change the upstream info"
msgstr ""
+#: builtin/branch.c:660
+msgid "Unset the upstream info"
+msgstr ""
+
#: builtin/branch.c:661
msgid "use colored output"
msgstr ""
@@ -4226,8 +4721,8 @@ msgstr ""
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
#: builtin/tag.c:369
msgid "object"
msgstr ""
@@ -4240,7 +4735,7 @@ msgstr ""
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:709 builtin/clone.c:707
+#: builtin/branch.c:709 builtin/clone.c:706
msgid "HEAD not found below refs/heads!"
msgstr ""
@@ -4343,61 +4838,75 @@ msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:443
+#: builtin/cat-file.c:513
msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:551
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:482
+#: builtin/cat-file.c:552
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:483
+#: builtin/cat-file.c:553
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:485
+#: builtin/cat-file.c:555
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:556
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:488
+#: builtin/cat-file.c:558
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:490
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:561 git-submodule.sh:923
+msgid "blob"
+msgstr ""
+
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:564
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:491
+#: builtin/cat-file.c:565
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:493
+#: builtin/cat-file.c:567
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:496
+#: builtin/cat-file.c:570
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:499
+#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:501
+#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
msgstr ""
@@ -4417,7 +4926,7 @@ msgstr ""
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
msgid "read file names from stdin"
msgstr ""
@@ -4425,7 +4934,7 @@ msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr ""
@@ -4515,9 +5024,9 @@ msgid "write the content to temporary files"
msgstr ""
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
+#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
+#: builtin/worktree.c:469
msgid "string"
msgstr ""
@@ -4588,54 +5097,54 @@ msgstr ""
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:495
+#: builtin/checkout.c:494
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:625
+#: builtin/checkout.c:624
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:664
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:668 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:660
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:675
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:679
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:681 builtin/checkout.c:1070
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:683
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:734
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:740
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4650,7 +5159,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:759
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4667,162 +5176,162 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:795
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:799
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:826 builtin/checkout.c:1065
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:971
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1079
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
#: builtin/worktree.c:326
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1144 builtin/worktree.c:328
+#: builtin/checkout.c:1143 builtin/worktree.c:328
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1154 builtin/merge.c:231
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
+#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1195
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1253
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4952,8 +5461,8 @@ msgstr ""
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
+#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
@@ -4989,290 +5498,306 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:62
+#: builtin/clone.c:65
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:67
+#: builtin/clone.c:70
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:69
+#: builtin/clone.c:72
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:71
+#: builtin/clone.c:74
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:73
+#: builtin/clone.c:76
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:75 builtin/clone.c:77
+#: builtin/clone.c:78 builtin/clone.c:80
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:79
+#: builtin/clone.c:82
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:80 builtin/init-db.c:473
+#: builtin/clone.c:83 builtin/init-db.c:475
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:81 builtin/init-db.c:474
+#: builtin/clone.c:84 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
+#: builtin/submodule--helper.c:954
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:85
+#: builtin/clone.c:90
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:92
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:94
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:96
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
+#: builtin/pull.c:202
msgid "depth"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: parse-options.h:142
+msgid "time"
+msgstr ""
+
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
+msgstr ""
+
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone by excluding rev"
+msgstr ""
+
+#: builtin/clone.c:104
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:97
+#: builtin/clone.c:106
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:482
+#: builtin/clone.c:107 builtin/init-db.c:484
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:99 builtin/init-db.c:483
+#: builtin/clone.c:108 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:109
msgid "key=value"
msgstr ""
-#: builtin/clone.c:101
+#: builtin/clone.c:110
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:241
+#: builtin/clone.c:250
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: builtin/clone.c:317
+#: builtin/clone.c:303
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:376
+#: builtin/clone.c:375
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:384
+#: builtin/clone.c:383
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:398
+#: builtin/clone.c:397
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:420
+#: builtin/clone.c:419
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:424
+#: builtin/clone.c:423
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:449
+#: builtin/clone.c:448
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:461
+#: builtin/clone.c:460
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:538
+#: builtin/clone.c:537
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:633
+#: builtin/clone.c:632
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:649
+#: builtin/clone.c:648
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:698
+#: builtin/clone.c:697
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:729
+#: builtin/clone.c:728
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:766
+#: builtin/clone.c:768
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:829
+#: builtin/clone.c:831
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:831
+#: builtin/clone.c:833
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:867
+#: builtin/clone.c:870
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:878
+#: builtin/clone.c:883
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:881
+#: builtin/clone.c:886
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:894
+#: builtin/clone.c:899
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:900 builtin/fetch.c:1293
+#: builtin/clone.c:905 builtin/fetch.c:1338
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:910
+#: builtin/clone.c:915
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:920
+#: builtin/clone.c:925
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:938
+#: builtin/clone.c:943
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:956
+#: builtin/clone.c:955
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:958
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:997
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+
+#: builtin/clone.c:1019
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1000
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1026
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1005
+#: builtin/clone.c:1031
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1009
+#: builtin/clone.c:1035
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1058 builtin/clone.c:1066
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1069
+#: builtin/clone.c:1101
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -5375,103 +5900,103 @@ msgid ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:308
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:349
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:355
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:368
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:370
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:448
+#: builtin/commit.c:458
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:450
+#: builtin/commit.c:460
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:459
+#: builtin/commit.c:469
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:478
+#: builtin/commit.c:488
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:585
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:604
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:612
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:656
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:707
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:711
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:743
+#: builtin/commit.c:742
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:797
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:815
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5481,7 +6006,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:820
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5491,14 +6016,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:840
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5506,341 +6031,345 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:860
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:868
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:875
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:893
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:950
+#: builtin/commit.c:954
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/commit.c:969 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1067
+#: builtin/commit.c:1071
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1086 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1119
+#: builtin/commit.c:1124
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1149
+#: builtin/commit.c:1154
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1158
+#: builtin/commit.c:1163
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1161
+#: builtin/commit.c:1166
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1163
+#: builtin/commit.c:1168
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1176
+#: builtin/commit.c:1181
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1186
+#: builtin/commit.c:1191
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1205
+#: builtin/commit.c:1210
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1207
+#: builtin/commit.c:1212
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1209
+#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1221 builtin/tag.c:474
+#: builtin/commit.c:1226 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1336 builtin/commit.c:1622
+#: builtin/commit.c:1341 builtin/commit.c:1617
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1338 builtin/commit.c:1624
+#: builtin/commit.c:1343 builtin/commit.c:1619
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/commit.c:1345
+msgid "version"
+msgstr ""
+
+#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1343 builtin/commit.c:1628
+#: builtin/commit.c:1348 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1346 builtin/commit.c:1631
+#: builtin/commit.c:1351 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
+#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr ""
-#: builtin/commit.c:1349 builtin/commit.c:1634
+#: builtin/commit.c:1354 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1352
+#: builtin/commit.c:1357
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1353 parse-options.h:155
+#: builtin/commit.c:1358 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1354
+#: builtin/commit.c:1359
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1356
+#: builtin/commit.c:1361
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1437
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1444
+#: builtin/commit.c:1439
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1489
+#: builtin/commit.c:1484
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1492
+#: builtin/commit.c:1487
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1596 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:351
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "author"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1598 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:326
msgid "date"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:349
msgid "message"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
msgid "commit"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1608
+#: builtin/commit.c:1603
msgid "default"
msgstr ""
-#: builtin/commit.c:1608 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
+#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1617
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1621
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1632
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1638
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1640
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1669
+#: builtin/commit.c:1664
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1719
+#: builtin/commit.c:1712
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1726
+#: builtin/commit.c:1719
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1745
+#: builtin/commit.c:1738
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1756
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1761
+#: builtin/commit.c:1754
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1809
+#: builtin/commit.c:1802
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5998,11 +6527,18 @@ msgstr ""
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/count-objects.c:77
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+
+#: builtin/count-objects.c:86
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:96
msgid "print sizes in human readable format"
msgstr ""
@@ -6116,7 +6652,7 @@ msgstr ""
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:410 builtin/name-rev.c:321
+#: builtin/describe.c:410 builtin/name-rev.c:320
msgid "show abbreviated commit object as fallback"
msgstr ""
@@ -6150,21 +6686,21 @@ msgstr ""
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:360
+#: builtin/diff.c:361
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:403
+#: builtin/diff.c:404
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:412
+#: builtin/diff.c:413
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:419
+#: builtin/diff.c:420
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
@@ -6237,247 +6773,259 @@ msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:93 builtin/pull.c:174
+#: builtin/fetch.c:95 builtin/pull.c:175
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:177
+#: builtin/fetch.c:97 builtin/pull.c:178
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:97 builtin/pull.c:180
+#: builtin/fetch.c:99 builtin/pull.c:181
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:98 builtin/pull.c:182
+#: builtin/fetch.c:100 builtin/pull.c:183
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:100
+#: builtin/fetch.c:102
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:102 builtin/pull.c:184
+#: builtin/fetch.c:104 builtin/pull.c:185
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:104
+#: builtin/fetch.c:106
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:106
+#: builtin/fetch.c:108
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:108 builtin/pull.c:187
+#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:109 builtin/pull.c:190
+#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:110 builtin/pull.c:191
+#: builtin/fetch.c:112 builtin/pull.c:192
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:114 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:200
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:116
+#: builtin/fetch.c:118
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:119 builtin/pull.c:202
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:121 builtin/pull.c:205
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:129 builtin/pull.c:206
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:123 builtin/log.c:1426
+#: builtin/fetch.c:131 builtin/log.c:1433
msgid "dir"
msgstr ""
-#: builtin/fetch.c:124
+#: builtin/fetch.c:132
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:127
+#: builtin/fetch.c:135
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:208
+#: builtin/fetch.c:137 builtin/pull.c:209
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:210
+#: builtin/fetch.c:138 builtin/pull.c:211
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:131 builtin/pull.c:211
+#: builtin/fetch.c:139 builtin/pull.c:212
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:387
+#: builtin/fetch.c:398
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:503
+#: builtin/fetch.c:514
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:592
+#: builtin/fetch.c:607
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:596
+#: builtin/fetch.c:611
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:609 builtin/fetch.c:689
+#: builtin/fetch.c:624 builtin/fetch.c:704
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:610
+#: builtin/fetch.c:625
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:619
+#: builtin/fetch.c:634
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
+#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:639
+#: builtin/fetch.c:654
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:642
+#: builtin/fetch.c:657
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:684
+#: builtin/fetch.c:699
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:689
+#: builtin/fetch.c:704
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:733
+#: builtin/fetch.c:749
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:753
+#: builtin/fetch.c:769
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:839 builtin/fetch.c:934
+#: builtin/fetch.c:856 builtin/fetch.c:952
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:850
+#: builtin/fetch.c:867
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:904
+#: builtin/fetch.c:922
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:905
+#: builtin/fetch.c:923
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:937
+#: builtin/fetch.c:955
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:938 builtin/remote.c:1020
+#: builtin/fetch.c:956 builtin/remote.c:1020
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:960
+#: builtin/fetch.c:979
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:979
+#: builtin/fetch.c:998
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1001
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1039
+#: builtin/fetch.c:1077
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1199
+#: builtin/fetch.c:1237
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1201 builtin/remote.c:96
+#: builtin/fetch.c:1239 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1219
+#: builtin/fetch.c:1257
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1242
+#: builtin/fetch.c:1280
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1284
+#: builtin/fetch.c:1322
+msgid "Negative depth in --deepen is not supported"
+msgstr ""
+
+#: builtin/fetch.c:1324
+msgid "--deepen and --depth are mutually exclusive"
+msgstr ""
+
+#: builtin/fetch.c:1329
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1286
+#: builtin/fetch.c:1331
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1306
+#: builtin/fetch.c:1353
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1308
+#: builtin/fetch.c:1355
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1366
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1374
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -6486,23 +7034,23 @@ msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:666
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:669
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:670
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:671
msgid "file to read from"
msgstr ""
@@ -6618,7 +7166,7 @@ msgstr ""
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:671
+#: builtin/fsck.c:665
msgid "Checking objects"
msgstr ""
@@ -6702,224 +7250,219 @@ msgstr ""
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/grep.c:452 builtin/grep.c:487
+#: builtin/grep.c:453 builtin/grep.c:488
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:502
+#: builtin/grep.c:503
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:560
+#: builtin/grep.c:561
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
-msgstr ""
-
-#: builtin/grep.c:646
+#: builtin/grep.c:647
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:648
+#: builtin/grep.c:649
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:650
+#: builtin/grep.c:651
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:652
+#: builtin/grep.c:653
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:655
+#: builtin/grep.c:656
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:657
+#: builtin/grep.c:658
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:659
+#: builtin/grep.c:660
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:661
+#: builtin/grep.c:662
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:663
+#: builtin/grep.c:664
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:666
+#: builtin/grep.c:667
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:668
+#: builtin/grep.c:669
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:672
+#: builtin/grep.c:673
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:675
+#: builtin/grep.c:676
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:678
+#: builtin/grep.c:679
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:681
+#: builtin/grep.c:682
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:685
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:685
+#: builtin/grep.c:686
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:686
+#: builtin/grep.c:687
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:688
+#: builtin/grep.c:689
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:690
+#: builtin/grep.c:691
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:692
+#: builtin/grep.c:693
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:695
+#: builtin/grep.c:696
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:697
+#: builtin/grep.c:698
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:699
+#: builtin/grep.c:700
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:700
+#: builtin/grep.c:701
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:702
+#: builtin/grep.c:703
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:705
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:707
+#: builtin/grep.c:708
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:710
+#: builtin/grep.c:711
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:713
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:714
+#: builtin/grep.c:715
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:715
+#: builtin/grep.c:716
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:718
+#: builtin/grep.c:719
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:720
+#: builtin/grep.c:721
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:723
+#: builtin/grep.c:724
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:725
+#: builtin/grep.c:726
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:727
+#: builtin/grep.c:728
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:740
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:741
+#: builtin/grep.c:742
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:743
+#: builtin/grep.c:744
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "pager"
msgstr ""
-#: builtin/grep.c:747
+#: builtin/grep.c:748
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:750
+#: builtin/grep.c:751
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:813
+#: builtin/grep.c:814
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/grep.c:846 builtin/index-pack.c:1480
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:901
+#: builtin/grep.c:902
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:906
+#: builtin/grep.c:907
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:909
+#: builtin/grep.c:910
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "both --cached and trees are given."
msgstr ""
@@ -6933,389 +7476,397 @@ msgstr ""
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "type"
msgstr ""
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:41
+#: builtin/help.c:42
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:42
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr ""
+
+#: builtin/help.c:44
msgid "print list of useful guides"
msgstr ""
-#: builtin/help.c:43
+#: builtin/help.c:45
msgid "show man page"
msgstr ""
-#: builtin/help.c:44
+#: builtin/help.c:46
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:46
+#: builtin/help.c:48
msgid "show info page"
msgstr ""
-#: builtin/help.c:52
+#: builtin/help.c:54
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/help.c:64
+#: builtin/help.c:66
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:91
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:104
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:112
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:205
+#: builtin/help.c:207
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:217
+#: builtin/help.c:219
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:334
+#: builtin/help.c:336
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:351
+#: builtin/help.c:353
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:359
+#: builtin/help.c:361
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:401
+#: builtin/help.c:403
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:402
+#: builtin/help.c:404
msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/help.c:403
+#: builtin/help.c:405
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:404
+#: builtin/help.c:406
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:405
+#: builtin/help.c:407
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:406
+#: builtin/help.c:408
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:407
+#: builtin/help.c:409
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:408
+#: builtin/help.c:410
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:420
+#: builtin/help.c:422
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:441 builtin/help.c:458
+#: builtin/help.c:440
#, c-format
-msgid "usage: %s%s"
+msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/help.c:474
+#: builtin/help.c:462 builtin/help.c:479
#, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "usage: %s%s"
msgstr ""
-#: builtin/index-pack.c:153
+#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr ""
-#: builtin/index-pack.c:203
+#: builtin/index-pack.c:204
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:298
+#: builtin/index-pack.c:299
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:314
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr ""
+
+#: builtin/index-pack.c:317
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:322
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:336
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:335
+#: builtin/index-pack.c:338
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:356
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:475
+#: builtin/index-pack.c:478
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:524
+#: builtin/index-pack.c:527
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:532
+#: builtin/index-pack.c:535
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:540
+#: builtin/index-pack.c:543
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:574
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:573
+#: builtin/index-pack.c:576
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:599
+#: builtin/index-pack.c:602
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:811 builtin/index-pack.c:820
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:166
+#: builtin/pack-objects.c:258
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:817
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:828
+#: builtin/index-pack.c:831
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:842
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:848
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:922 builtin/index-pack.c:953
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1120
+#: builtin/index-pack.c:1123
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1174
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1197
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1250
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1296
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1371
+#: builtin/index-pack.c:1372
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1396
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1416
+#: builtin/index-pack.c:1417
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
@@ -7355,126 +7906,126 @@ msgstr ""
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1732
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1738
+#: builtin/index-pack.c:1740
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/init-db.c:55
+#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/init-db.c:61
+#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/init-db.c:66
+#: builtin/init-db.c:65
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:77
+#: builtin/init-db.c:76
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:79
+#: builtin/init-db.c:78
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:85
+#: builtin/init-db.c:84
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:120
+#: builtin/init-db.c:119
#, c-format
msgid "templates not found %s"
msgstr ""
-#: builtin/init-db.c:135
+#: builtin/init-db.c:134
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:312 builtin/init-db.c:315
+#: builtin/init-db.c:327
#, c-format
-msgid "%s already exists"
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:344
+#: builtin/init-db.c:330
#, c-format
-msgid "unable to handle file type %d"
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:347
+#: builtin/init-db.c:347 builtin/init-db.c:350
#, c-format
-msgid "unable to move %s to %s"
+msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:402
+#: builtin/init-db.c:403
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:407
+#: builtin/init-db.c:408
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:455
+#: builtin/init-db.c:457
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:478
+#: builtin/init-db.c:480
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:513 builtin/init-db.c:518
+#: builtin/init-db.c:515 builtin/init-db.c:520
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:522
+#: builtin/init-db.c:524
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:543
+#: builtin/init-db.c:545
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
@@ -7583,344 +8134,349 @@ msgstr ""
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1064
+#: builtin/log.c:1063
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1092
+#: builtin/log.c:1091
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1137
+#: builtin/log.c:1141
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1259
+#: builtin/log.c:1263
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1263
+#: builtin/log.c:1267
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-#: builtin/log.c:1283
+#: builtin/log.c:1287
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1294
+#: builtin/log.c:1298
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1298
+#: builtin/log.c:1302
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1347
+#: builtin/log.c:1351
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1404
+#: builtin/log.c:1408
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1407
+#: builtin/log.c:1411
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1411
+#: builtin/log.c:1415
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1413
+#: builtin/log.c:1417
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1415
+#: builtin/log.c:1419
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1416
+#: builtin/log.c:1420
msgid "sfx"
msgstr ""
-#: builtin/log.c:1417
+#: builtin/log.c:1421
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1419
+#: builtin/log.c:1423
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1421
+#: builtin/log.c:1425
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1423
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1430
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1426
+#: builtin/log.c:1433
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1429
+#: builtin/log.c:1436
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1432
+#: builtin/log.c:1439
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1434
+#: builtin/log.c:1441
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1438
+#: builtin/log.c:1445
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1440
+#: builtin/log.c:1447
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "header"
msgstr ""
-#: builtin/log.c:1442
+#: builtin/log.c:1449
msgid "add email header"
msgstr ""
-#: builtin/log.c:1443 builtin/log.c:1445
+#: builtin/log.c:1450 builtin/log.c:1452
msgid "email"
msgstr ""
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "ident"
msgstr ""
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "message-id"
msgstr ""
-#: builtin/log.c:1451
+#: builtin/log.c:1458
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1452 builtin/log.c:1455
+#: builtin/log.c:1459 builtin/log.c:1462
msgid "boundary"
msgstr ""
-#: builtin/log.c:1453
+#: builtin/log.c:1460
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1456
+#: builtin/log.c:1463
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1462
+#: builtin/log.c:1469
msgid "signature"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1464
+#: builtin/log.c:1471
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1465
+#: builtin/log.c:1472
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1468
+#: builtin/log.c:1475
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1558
+#: builtin/log.c:1565
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1568
+#: builtin/log.c:1575
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1570
+#: builtin/log.c:1577
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1572
+#: builtin/log.c:1579
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1602
+#: builtin/log.c:1609
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1604
+#: builtin/log.c:1611
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1698
+#: builtin/log.c:1705
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1769
+#: builtin/log.c:1777
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1818
+#: builtin/log.c:1826
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1872
+#: builtin/log.c:1880
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:379
+#: builtin/ls-files.c:458
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:428
+#: builtin/ls-files.c:507
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:509
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:511
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:513
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:436
+#: builtin/ls-files.c:515
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:438
+#: builtin/ls-files.c:517
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:519
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:443
+#: builtin/ls-files.c:522
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:445
+#: builtin/ls-files.c:524
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:526
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:449
+#: builtin/ls-files.c:528
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:451
+#: builtin/ls-files.c:530
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:454
+#: builtin/ls-files.c:533
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:456
+#: builtin/ls-files.c:535
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:537
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:540
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:543
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:545
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:548
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:551
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:553
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:554
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:474
+#: builtin/ls-files.c:555
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:476
+#: builtin/ls-files.c:557
msgid "show debugging data"
msgstr ""
@@ -8034,31 +8590,31 @@ msgstr ""
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:195 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:198 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:145
msgid "edit message before committing"
msgstr ""
@@ -8066,28 +8622,28 @@ msgstr ""
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:211 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:215 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
#: builtin/revert.c:89
msgid "strategy"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:159
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:218 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option=value"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr ""
@@ -8099,7 +8655,7 @@ msgstr ""
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:227 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr ""
@@ -8306,55 +8862,55 @@ msgstr ""
msgid "Already up-to-date."
msgstr ""
-#: builtin/merge.c:1382
+#: builtin/merge.c:1377
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1419
+#: builtin/merge.c:1418
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1426
+#: builtin/merge.c:1425
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1451
+#: builtin/merge.c:1450
msgid "Already up-to-date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1457
+#: builtin/merge.c:1456
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/merge.c:1479 builtin/merge.c:1558
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1550
+#: builtin/merge.c:1549
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1552
+#: builtin/merge.c:1551
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1561
+#: builtin/merge.c:1560
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8379,23 +8935,23 @@ msgstr ""
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/merge-base.c:214
+#: builtin/merge-base.c:217
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:216
+#: builtin/merge-base.c:219
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:221
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:223
msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:225
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
@@ -8437,6 +8993,37 @@ msgstr ""
msgid "set labels for file1/orig-file/file2"
msgstr ""
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
@@ -8545,43 +9132,43 @@ msgstr ""
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:257
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:311
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:312
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:314
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:316
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:317
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:318
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:324
msgid "dereference tags in the input (internal use)"
msgstr ""
@@ -8709,7 +9296,7 @@ msgid "failed to finish 'show' for object '%s'"
msgstr ""
#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
#: builtin/notes.c:203
@@ -8718,7 +9305,7 @@ msgstr ""
#: builtin/notes.c:205
#, c-format
-msgid "The note contents have been left in %s"
+msgid "the note contents have been left in %s"
msgstr ""
#: builtin/notes.c:233 builtin/tag.c:439
@@ -8731,158 +9318,214 @@ msgstr ""
msgid "could not open or read '%s'"
msgstr ""
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
#: builtin/notes.c:257
#, c-format
-msgid "Failed to read object '%s'."
+msgid "failed to read object '%s'."
msgstr ""
#: builtin/notes.c:261
#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "No note found for object %s."
+msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:397 builtin/notes.c:560
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:400 builtin/notes.c:563
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:410 builtin/notes.c:481
+#: builtin/notes.c:412 builtin/notes.c:483
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:435
+#: builtin/notes.c:437
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:450 builtin/notes.c:529
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:482
+#: builtin/notes.c:484
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:484
+#: builtin/notes.c:486
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:502
+#: builtin/notes.c:504
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:523
+#: builtin/notes.c:525
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:535
+#: builtin/notes.c:537
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:587
+#: builtin/notes.c:589
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:753
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:755
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "General options"
msgstr ""
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:792
+#: builtin/notes.c:794
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:821
+#: builtin/notes.c:823
#, c-format
-msgid "Unknown -s/--strategy: %s"
+msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:858
+#: builtin/notes.c:860
#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
+msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:861
+#: builtin/notes.c:863
#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -8890,222 +9533,218 @@ msgid ""
"abort'.\n"
msgstr ""
-#: builtin/notes.c:885
+#: builtin/notes.c:887
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:897
+#: builtin/notes.c:899
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:900
+#: builtin/notes.c:902
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:939
+#: builtin/notes.c:941
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:981
+#: builtin/notes.c:983
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:982
+#: builtin/notes.c:984
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1017 builtin/remote.c:1623
+#: builtin/notes.c:1019
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:28
+#: builtin/pack-objects.c:29
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:768
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:781
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1037
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2197
+#: builtin/pack-objects.c:2346
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2759
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2763
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2793
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2795
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2797
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2800
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2801
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2802
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2805
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2807
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2809
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2811
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2813
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2815
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2817
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2819
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2821
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2823
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2825
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2679
+#: builtin/pack-objects.c:2827
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2829
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2832
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2687
+#: builtin/pack-objects.c:2835
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2838
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2693
+#: builtin/pack-objects.c:2841
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2695
+#: builtin/pack-objects.c:2843
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2697
+#: builtin/pack-objects.c:2845
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2699
+#: builtin/pack-objects.c:2847
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
-msgstr ""
-
-#: builtin/pack-objects.c:2701
+#: builtin/pack-objects.c:2849
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2704
+#: builtin/pack-objects.c:2852
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2706
+#: builtin/pack-objects.c:2854
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2708
+#: builtin/pack-objects.c:2856
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2710
+#: builtin/pack-objects.c:2858
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2712
+#: builtin/pack-objects.c:2860
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2862
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2716
+#: builtin/pack-objects.c:2864
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2993
msgid "Counting objects"
msgstr ""
@@ -9145,69 +9784,62 @@ msgstr ""
msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/pull.c:72
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:73
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:120
+#: builtin/pull.c:121
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:147 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/revert.c:101
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:156
+#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:172
+#: builtin/pull.c:173
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:194
+#: builtin/pull.c:195
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:283
+#: builtin/pull.c:284
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
-msgstr ""
-
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: builtin/pull.c:463
+#: builtin/pull.c:397
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:465
+#: builtin/pull.c:399
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:466
+#: builtin/pull.c:400
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:469
+#: builtin/pull.c:403
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9215,61 +9847,69 @@ msgid ""
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:474 git-parse-remote.sh:73
+#: builtin/pull.c:408 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:479 builtin/pull.c:494
+#: builtin/pull.c:413 builtin/pull.c:428
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:489 git-parse-remote.sh:75
+#: builtin/pull.c:423 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:498 git-parse-remote.sh:95
+#: builtin/pull.c:432 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:503
+#: builtin/pull.c:437
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pull.c:820
+#: builtin/pull.c:754
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:867
+#: builtin/pull.c:801
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:875
+#: builtin/pull.c:809
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:903
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:838
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9277,7 +9917,7 @@ msgid ""
"commit %s."
msgstr ""
-#: builtin/pull.c:908
+#: builtin/pull.c:843
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9288,11 +9928,11 @@ msgid ""
"to recover."
msgstr ""
-#: builtin/pull.c:923
+#: builtin/pull.c:858
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:927
+#: builtin/pull.c:862
msgid "Cannot rebase onto multiple branches."
msgstr ""
@@ -9610,15 +10250,44 @@ msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/receive-pack.c:25
+#: builtin/receive-pack.c:26
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:1843
+#: builtin/receive-pack.c:793
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set 'receive.denyCurrentBranch' configuration variable to\n"
+"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:813
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1883
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1857
+#: builtin/receive-pack.c:1897
msgid "You must specify a directory."
msgstr ""
@@ -9935,7 +10604,7 @@ msgstr ""
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
msgid "(no URL)"
msgstr ""
@@ -9972,7 +10641,7 @@ msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1179 builtin/remote.c:1206
+#: builtin/remote.c:1179 builtin/remote.c:1205
msgid " (status not queried)"
msgstr ""
@@ -9986,138 +10655,143 @@ msgstr[1] ""
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1203
+#: builtin/remote.c:1202
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1224
+#: builtin/remote.c:1223
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1226
+#: builtin/remote.c:1225
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1240
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1243
+#: builtin/remote.c:1242
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1253
+#: builtin/remote.c:1252
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1261
+#: builtin/remote.c:1260
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1263
+#: builtin/remote.c:1262
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1281
+#: builtin/remote.c:1280
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1282
+#: builtin/remote.c:1281
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1292
+#: builtin/remote.c:1291
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1293
+#: builtin/remote.c:1292
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1309
+#: builtin/remote.c:1308
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1312
+#: builtin/remote.c:1311
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1357
+#: builtin/remote.c:1356
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1436
+#: builtin/remote.c:1435
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1443
+#: builtin/remote.c:1442
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1460
+#: builtin/remote.c:1459
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1462
+#: builtin/remote.c:1461
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1490
+#: builtin/remote.c:1489
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1516
+#: builtin/remote.c:1515
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1518
+#: builtin/remote.c:1517
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1520
+#: builtin/remote.c:1519
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1527
+#: builtin/remote.c:1526
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1568
+#: builtin/remote.c:1567
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1576
+#: builtin/remote.c:1575
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1578
+#: builtin/remote.c:1577
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1592
+#: builtin/remote.c:1591
msgid "be verbose; must be placed before a subcommand"
msgstr ""
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
#: builtin/repack.c:17
msgid "git repack [<options>]"
msgstr ""
@@ -10301,7 +10975,7 @@ msgid ""
msgstr ""
#: builtin/reset.c:27
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
#: builtin/reset.c:28
@@ -10420,27 +11094,27 @@ msgstr ""
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:362
+#: builtin/rev-list.c:354
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:358
+#: builtin/rev-parse.c:386
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:363
+#: builtin/rev-parse.c:391
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:393
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:396
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:527
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10526,7 +11200,7 @@ msgstr ""
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:207
+#: builtin/revert.c:205
msgid "cherry-pick failed"
msgstr ""
@@ -10674,70 +11348,124 @@ msgstr ""
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:375
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:541
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:639
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:642
+#: builtin/show-branch.c:641
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:643
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:665
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:733
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:737
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:829
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
#: builtin/show-ref.c:10
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -10796,12 +11524,12 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
@@ -10811,181 +11539,200 @@ msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
+#: builtin/submodule--helper.c:590
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:283
+#: builtin/submodule--helper.c:287
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:364
+#: builtin/submodule--helper.c:369
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:368
+#: builtin/submodule--helper.c:373
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:378
+#: builtin/submodule--helper.c:383
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:385
+#: builtin/submodule--helper.c:390
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:409
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:430
+#: builtin/submodule--helper.c:435
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:441
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:563
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:570
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:593
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:596
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:599
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:605
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:504
+#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+msgid "force cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:613
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
+#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c:644
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:660
#, c-format
msgid "cannot open file '%s'"
msgstr ""
-#: builtin/submodule--helper.c:552
+#: builtin/submodule--helper.c:665
#, c-format
msgid "could not close file %s"
msgstr ""
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:672
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:726
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:730
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:641
+#: builtin/submodule--helper.c:756
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:662
+#: builtin/submodule--helper.c:777
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:792
+#: builtin/submodule--helper.c:913
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:803
+#: builtin/submodule--helper.c:924
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:945
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:948
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:831
+#: builtin/submodule--helper.c:952
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:956
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:838
+#: builtin/submodule--helper.c:959
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:840
+#: builtin/submodule--helper.c:961
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:841
+#: builtin/submodule--helper.c:962
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:846
+#: builtin/submodule--helper.c:969
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:979
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:927
+#: builtin/submodule--helper.c:1050
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1100
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
-#: builtin/submodule--helper.c:984
+#: builtin/submodule--helper.c:1107
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -11208,7 +11955,7 @@ msgstr ""
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/unpack-objects.c:490
+#: builtin/unpack-objects.c:493
msgid "Unpacking objects"
msgstr ""
@@ -11270,131 +12017,143 @@ msgstr ""
msgid " OK"
msgstr ""
-#: builtin/update-index.c:575
+#: builtin/update-index.c:564
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:930
+#: builtin/update-index.c:919
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:933
+#: builtin/update-index.c:922
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:936
+#: builtin/update-index.c:925
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:938
+#: builtin/update-index.c:927
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:940
+#: builtin/update-index.c:929
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:942
+#: builtin/update-index.c:931
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:945
+#: builtin/update-index.c:934
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:949
+#: builtin/update-index.c:938
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:953
+#: builtin/update-index.c:942
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:954
+#: builtin/update-index.c:943
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:963
+#: builtin/update-index.c:952
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:955
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:958
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:972
+#: builtin/update-index.c:961
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:975
+#: builtin/update-index.c:964
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:977
+#: builtin/update-index.c:966
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:968
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:981
+#: builtin/update-index.c:970
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:985
+#: builtin/update-index.c:974
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:989
+#: builtin/update-index.c:978
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:993
+#: builtin/update-index.c:982
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:986
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:989
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:991
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:995
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:997
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:999
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1001
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1003
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1134
+#: builtin/update-index.c:1119
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1123
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1146
+#: builtin/update-index.c:1131
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1135
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
@@ -11591,26 +12350,35 @@ msgstr ""
msgid "only useful for debugging"
msgstr ""
-#: upload-pack.c:20
+#: upload-pack.c:22
msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: upload-pack.c:837
+#: upload-pack.c:1028
msgid "quit after a single request/response exchange"
msgstr ""
-#: upload-pack.c:839
+#: upload-pack.c:1030
msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: upload-pack.c:841
+#: upload-pack.c:1032
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: upload-pack.c:843
+#: upload-pack.c:1034
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr ""
@@ -11622,7 +12390,11 @@ msgid ""
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:323
+#: http.c:342
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr ""
+
+#: http.c:351
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
@@ -11738,15 +12510,15 @@ msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:237
+#: parse-options.h:238
msgid "be more verbose"
msgstr ""
-#: parse-options.h:239
+#: parse-options.h:240
msgid "be more quiet"
msgstr ""
-#: parse-options.h:245
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr ""
@@ -11947,7 +12719,7 @@ msgid "Automated merge did not work."
msgstr ""
#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+msgid "Should not be doing an octopus."
msgstr ""
#: git-merge-octopus.sh:73
@@ -12116,6 +12888,10 @@ msgstr ""
msgid "Cannot save the current index state"
msgstr ""
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
+msgstr ""
+
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr ""
@@ -12154,6 +12930,10 @@ msgid ""
" To provide a message, use git stash save -- '$option'"
msgstr ""
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+
#: git-stash.sh:259
msgid "No local changes to save"
msgstr ""
@@ -12175,96 +12955,100 @@ msgstr ""
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:404
+#: git-stash.sh:403
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:414
+#: git-stash.sh:416
msgid "No stash found."
msgstr ""
-#: git-stash.sh:421
+#: git-stash.sh:423
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:427
+#: git-stash.sh:438
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:455
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:466
+#: git-stash.sh:477
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:485
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:478
+#: git-stash.sh:489
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:486
+#: git-stash.sh:497
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:488
+#: git-stash.sh:499
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:522
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
+msgstr ""
+
+#: git-stash.sh:533
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:537
+#: git-stash.sh:548
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:551
+#: git-stash.sh:562
msgid "The stash is kept in case you need it again."
msgstr ""
-#: git-stash.sh:560
+#: git-stash.sh:571
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:561
+#: git-stash.sh:572
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:569
+#: git-stash.sh:580
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:641
+#: git-stash.sh:652
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:183
+#: git-submodule.sh:184
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:193
+#: git-submodule.sh:194
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:214
+#: git-submodule.sh:215
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12272,22 +13056,22 @@ msgid ""
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:232
+#: git-submodule.sh:233
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:242
+#: git-submodule.sh:243
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:244
+#: git-submodule.sh:245
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -12298,188 +13082,184 @@ msgid ""
"option."
msgstr ""
-#: git-submodule.sh:250
+#: git-submodule.sh:251
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:262
+#: git-submodule.sh:263
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:268
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:276
+#: git-submodule.sh:277
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:323
+#: git-submodule.sh:324
#, sh-format
msgid "Entering '$displaypath'"
msgstr ""
-#: git-submodule.sh:343
+#: git-submodule.sh:344
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:414
+#: git-submodule.sh:415
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr ""
-#: git-submodule.sh:419
+#: git-submodule.sh:420
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:439
+#: git-submodule.sh:440
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:447
+#: git-submodule.sh:448
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:450
+#: git-submodule.sh:451
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:451
+#: git-submodule.sh:452
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:454
+#: git-submodule.sh:455
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:463
+#: git-submodule.sh:464
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:612
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:622
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:627
+#: git-submodule.sh:632
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:645
+#: git-submodule.sh:650
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:651
+#: git-submodule.sh:656
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:658
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:659
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:663
+#: git-submodule.sh:668
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:664
+#: git-submodule.sh:669
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:669
+#: git-submodule.sh:674
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:670
+#: git-submodule.sh:675
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:675
+#: git-submodule.sh:680
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:676
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:707
+#: git-submodule.sh:712
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:815
+#: git-submodule.sh:820
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:867
+#: git-submodule.sh:872
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:887
+#: git-submodule.sh:892
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:890
+#: git-submodule.sh:895
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:898
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:918
-msgid "blob"
-msgstr ""
-
-#: git-submodule.sh:1040
+#: git-submodule.sh:1045
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1107
+#: git-submodule.sh:1112
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
@@ -12724,7 +13504,9 @@ msgid ""
msgstr ""
#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
msgstr ""
#: git-rebase--interactive.sh:1045
@@ -12748,7 +13530,7 @@ msgid ""
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"In both case, once you're done, continue with:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
@@ -12776,51 +13558,47 @@ msgid ""
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
-msgstr ""
-
-#: git-rebase--interactive.sh:1153
+#: git-rebase--interactive.sh:1150
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1155
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1156
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1161
+#: git-rebase--interactive.sh:1158
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase--interactive.sh:1276
+#: git-rebase--interactive.sh:1273
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:1281
+#: git-rebase--interactive.sh:1278
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1285
msgid "Note that empty commits are commented out"
msgstr ""
@@ -12847,6 +13625,10 @@ msgstr ""
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+
#: git-sh-setup.sh:229
#, sh-format
msgid "Cannot $action: You have unstaged changes."
@@ -12856,11 +13638,19 @@ msgstr ""
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+
#: git-sh-setup.sh:248
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr ""
+
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index d89a6fb..41c016e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -58,8 +58,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-15 22:43+0800\n"
-"PO-Revision-Date: 2016-08-21 22:41+0900\n"
+"POT-Creation-Date: 2016-11-22 22:10+0800\n"
+"PO-Revision-Date: 2016-11-22 22:16+0800\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
"ko>\n"
@@ -150,6 +150,614 @@ msgstr ""
" git checkout -b <새-브랜치-이름>\n"
"\n"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "알 수 없는 공백 옵션 '%s'"
+
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "알 수 없는 공백 무시 옵션 '%s'"
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject 및 --3way 옵션은 같이 쓸 수 없습니다."
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached 및 --3way 옵션은 같이 쓸 수 없습니다."
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "저장소 밖에서 --3way 옵션 사용"
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "저장소 밖에서 --index 옵션 사용"
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "저장소 밖에서 --cached 옵션 사용"
+
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "타임스탬프 정규식을 준비할 수 없습니다 (%s)"
+
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s"
+
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다"
+
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: 잘못된 git-diff - %2$d번 줄에서 /dev/null을 기대했지만, '%1$s'이"
+"(가) 왔습니다"
+
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: 잘못된 git-diff - %d번 줄에 새 파일 이름이 올바르지 않습니다"
+
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: 잘못된 git-diff - %d번 줄에 예전 파일 이름이 올바르지 않습니다"
+
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: 잘못된 git-diff - %d번 줄에서 /dev/null을 기대했습니다"
+
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: 예상치 못한 줄: %.*s"
+
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s"
+
+#: apply.c:1577
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니"
+"다. (%d번 줄)"
+
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff 헤더에 파일 이름 정보가 없습니다 (%d번 줄)"
+
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "새 파일이 예전 내용에 의존합니다"
+
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "삭제한 파일에 아직 내용이 들어 있습니다"
+
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "패치가 %d번 줄에서 망가졌습니다"
+
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "새 파일 %s이(가) 예전 내용에 의존합니다"
+
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다"
+
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다"
+
+#: apply.c:1984
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s"
+
+#: apply.c:2021
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다"
+
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "%d번 줄에 쓰레기 데이터만 있는 패치"
+
+#: apply.c:2274
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
+
+#: apply.c:2278
+#, c-format
+msgid "unable to open or read %s"
+msgstr "%s을(를) 열거나 읽을 수 없습니다"
+
+#: apply.c:2931
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "줄 시작이 잘못됨: '%c'"
+
+#: apply.c:3050
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "패치 %d번 부분 %d번 줄에서 성공 (오프셋 %d번 줄)"
+
+#: apply.c:3062
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)"
+
+#: apply.c:3068
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"다음을 검색하던 중:\n"
+"%.*s"
+
+#: apply.c:3090
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
+
+#: apply.c:3098
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
+
+#: apply.c:3144
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
+
+#: apply.c:3154
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "패치가 '%s'(%s)에 적용되지만, 현재 내용과 일치하지 않습니다."
+
+#: apply.c:3162
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "패치는 빈 '%s'에 적용되지만, 현재 비어 있지 않습니다"
+
+#: apply.c:3180
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "'%2$s'에 대한 필요한 %1$s 포스트이미지를 읽을 수 없습니다"
+
+#: apply.c:3193
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다"
+
+#: apply.c:3199
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실"
+"제 %s)"
+
+#: apply.c:3220
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "패치 실패: %s:%ld"
+
+#: apply.c:3342
+#, c-format
+msgid "cannot checkout %s"
+msgstr "%s을(를) 가져올 수 없습니다"
+
+#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr "%s을(를) 읽는데 실패했습니다"
+
+#: apply.c:3398
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기"
+
+#: apply.c:3427 apply.c:3667
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다"
+
+#: apply.c:3510 apply.c:3681
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: 인덱스에 없습니다"
+
+#: apply.c:3519 apply.c:3689
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: 인덱스와 맞지 않습니다"
+
+#: apply.c:3554
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
+
+#: apply.c:3557
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "3-방향 병합으로 대신합니다...\n"
+
+#: apply.c:3573 apply.c:3577
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "'%s'의 현재 내용을 읽을 수 없습니다"
+
+#: apply.c:3589
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "3-방향 병합으로 대신하는데 실패했습니다...\n"
+
+#: apply.c:3603
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "패치를 '%s'에 충돌이 있는 상태로 적용.\n"
+
+#: apply.c:3608
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "패치를 '%s'에 패치 문제 없이 적용.\n"
+
+#: apply.c:3634
+msgid "removal patch leaves file contents"
+msgstr "제거하는 패치 다음에 파일 내용이 남았습니다"
+
+#: apply.c:3706
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: 잘못된 종류"
+
+#: apply.c:3708
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다"
+
+#: apply.c:3859 apply.c:3861
+#, c-format
+msgid "invalid path '%s'"
+msgstr "잘못된 경로 '%s'"
+
+#: apply.c:3917
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: 이미 인덱스에 있습니다"
+
+#: apply.c:3920
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: 이미 작업 디렉터리에 있습니다"
+
+#: apply.c:3940
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
+
+#: apply.c:3945
+#, 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:3965
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다"
+
+#: apply.c:3969
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: 패치를 적용하지 않습니다"
+
+#: apply.c:3984
+#, c-format
+msgid "Checking patch %s..."
+msgstr "%s 패치를 확인하는 중입니다..."
+
+#: apply.c:4075
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "sha1 정보가 없거나 %s 하위 모듈에서 쓸 수 없습니다"
+
+#: apply.c:4082
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "%s에 대한 모드 변경이지만, 현재 HEAD에 없습니다"
+
+#: apply.c:4085
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 정보가 없거나 쓸 수 없습니다 (%s)."
+
+#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "경로 '%s'에 대해 make_cache_entry 실패"
+
+#: apply.c:4094
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "임시 인덱스에 %s 항목을 추가할 수 없습니다"
+
+#: apply.c:4104
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "임시 인덱스를 %s에 쓸 수 없습니다"
+
+#: apply.c:4242
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "인덱스에서 %s을(를) 제거할 수 없습니다"
+
+#: apply.c:4277
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "하위 모듈 %s에 대해 손상된 패치"
+
+#: apply.c:4283
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다"
+
+#: apply.c:4291
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "새로 만든 파일 '%s'에 대해 예비 저장소를 만들 수 없습니다"
+
+#: apply.c:4297 apply.c:4441
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다"
+
+#: apply.c:4338
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "'%s'에 쓰는데 실패했습니다"
+
+#: apply.c:4342
+#, c-format
+msgid "closing file '%s'"
+msgstr "'%s' 파일을 닫는 중입니다"
+
+#: apply.c:4412
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)"
+
+#: apply.c:4510
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "%s 패치 깔끔하게 적용."
+
+#: apply.c:4518
+msgid "internal error"
+msgstr "내부 오류"
+
+#: apply.c:4521
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "%%s 패치를 (%d개 거부) 적용..."
+
+#: apply.c:4532
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름"
+
+#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#, c-format
+msgid "cannot open %s"
+msgstr "%s을(를) 열 수 없습니다"
+
+#: apply.c:4554
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "패치 부위 #%d 깔끔하게 적용."
+
+#: apply.c:4558
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "패치 부위 #%d 거부됨."
+
+#: apply.c:4668
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "패치 '%s' 건너뜀."
+
+#: apply.c:4676
+msgid "unrecognized input"
+msgstr "인식할 수 없는 입력"
+
+#: apply.c:4695
+msgid "unable to read index file"
+msgstr "인덱스 파일을 읽을 수 없습니다"
+
+#: apply.c:4833
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "'%s' 패치를 열 수 없습니다: %s"
+
+#: apply.c:4858
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "공백 오류 %d개를 넘어갑니다"
+
+#: apply.c:4864 apply.c:4879
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d번 줄에서 공백 오류를 추가합니다."
+
+#: apply.c:4872
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "공백 오류를 바로잡은 뒤에 %d번 줄 적용."
+
+#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+msgid "Unable to write new index file"
+msgstr "새 인덱스 파일에 쓸 수 없습니다"
+
+#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+msgid "path"
+msgstr "경로"
+
+#: apply.c:4920
+msgid "don't apply changes matching the given path"
+msgstr "주어진 경로에 해당하는 변경 사항을 적용하지 않습니다"
+
+#: apply.c:4923
+msgid "apply changes matching the given path"
+msgstr "주어진 경로에 해당하는 변경 사항을 적용합니다"
+
+#: apply.c:4925 builtin/am.c:2286
+msgid "num"
+msgstr "개수"
+
+#: apply.c:4926
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "전통적인 diff 경로 앞의 <개수>개의 앞 슬래시(/)를 제거합니다"
+
+#: apply.c:4929
+msgid "ignore additions made by the patch"
+msgstr "패치에서 추가하는 파일을 무시합니다"
+
+#: apply.c:4931
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "패치를 적용하는 대신, 입력에 대한 diffstat을 출력합니다"
+
+#: apply.c:4935
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "십진수로 추가 및 삭제한 줄 수를 표시합니다"
+
+#: apply.c:4937
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "패치를 적용하는 대신, 입력에 대한 요약을 출력합니다"
+
+#: apply.c:4939
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "패치를 적용하는 대신, 패치를 적용 가능한지 확인합니다"
+
+#: apply.c:4941
+msgid "make sure the patch is applicable to the current index"
+msgstr "현재 인덱스에서 패치가 적용 가능한지 확인합니다"
+
+#: apply.c:4943
+msgid "apply a patch without touching the working tree"
+msgstr "작업 폴더를 바꾸지 않고 패치를 적용합니다"
+
+#: apply.c:4945
+msgid "accept a patch that touches outside the working area"
+msgstr "작업 영역 밖의 파일을 바꾸는 패치를 허용합니다"
+
+#: apply.c:4947
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "그리고 패치도 적용합니다 (--stat/--summary/--check 옵션과 같이 사용)"
+
+#: apply.c:4949
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "패치를 적용하지 않으면 3-방향 병합을 시도합니다"
+
+#: apply.c:4951
+msgid "build a temporary index based on embedded index information"
+msgstr "내장 인덱스 정보를 사용해 임시 인덱스를 만듭니다"
+
+#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+msgid "paths are separated with NUL character"
+msgstr "경로를 NUL 문자로 구분합니다"
+
+#: apply.c:4956
+msgid "ensure at least <n> lines of context match"
+msgstr "최소한 <n>줄이 컨텍스트와 일치하는지 확인합니다"
+
+#: apply.c:4957 builtin/am.c:2265
+msgid "action"
+msgstr "동작"
+
+#: apply.c:4958
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "공백 오류가 있는 추가됐거나 수정된 줄을 찾습니다"
+
+#: apply.c:4961 apply.c:4964
+msgid "ignore changes in whitespace when finding context"
+msgstr "컨텍스트를 찾을 때 공백 변경 사항을 무시합니다"
+
+#: apply.c:4967
+msgid "apply the patch in reverse"
+msgstr "패치를 반대 순서로 적용합니다"
+
+#: apply.c:4969
+msgid "don't expect at least one line of context"
+msgstr "최소한의 컨텍스트 한 줄도 없이 적용합니다"
+
+#: apply.c:4971
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "거부된 패치 부분을 대응되는 *.rej 파일에 남겨둡니다"
+
+#: apply.c:4973
+msgid "allow overlapping hunks"
+msgstr "패치 부분이 겹쳐도 허용합니다"
+
+#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
+#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "자세히 표시"
+
+#: apply.c:4976
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "파일 끝에 줄바꿈이 빠졌음을 잘못 검색한 경우에 무시합니다"
+
+#: apply.c:4979
+msgid "do not trust the line counts in the hunk headers"
+msgstr "패치 부분의 헤더의 줄 수를 신용하지 않습니다"
+
+#: apply.c:4981 builtin/am.c:2274
+msgid "root"
+msgstr "최상위"
+
+#: apply.c:4982
+msgid "prepend <root> to all filenames"
+msgstr "모든 파일 이름에 <최상위>를 앞에 붙입니다"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<옵션>] <트리-따위> [<경로>...]"
@@ -169,7 +777,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <저장소> [--exec <명령>] --list"
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "'%s' 경로명세가 어떤 파일과도 일치하지 않습니다"
@@ -182,7 +790,7 @@ msgstr "형식"
msgid "archive format"
msgstr "압축 형식"
-#: archive.c:430 builtin/log.c:1422
+#: archive.c:430 builtin/log.c:1429
msgid "prefix"
msgstr "접두어"
@@ -190,11 +798,11 @@ msgstr "접두어"
msgid "prepend prefix to each pathname in the archive"
msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
-#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
-#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
-#: builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
+#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
+#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "파일"
@@ -226,8 +834,8 @@ msgstr "더 작게 압축"
msgid "list supported archive formats"
msgstr "지원하는 압축 형식의 목록을 표시합니다"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
msgid "repo"
msgstr "저장소"
@@ -235,7 +843,7 @@ msgstr "저장소"
msgid "retrieve the archive from remote repository <repo>"
msgstr "원격 저장소 <저장소>에서 아카이브를 가져옵니다"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "명령"
@@ -509,27 +1117,27 @@ msgstr ""
"새 로컬 브랜치를 거기에 해당하는 리모트 브랜치로 push하려면,\n"
"\"git push -u\"로 push하는 업스트림을 설정할 수 있습니다."
-#: branch.c:266
+#: branch.c:265
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "올바른 오브젝트 이름이 아닙니다: '%s'."
-#: branch.c:286
+#: branch.c:285
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "애매한 오브젝트 이름: '%s'."
-#: branch.c:291
+#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
-#: branch.c:345
+#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다"
-#: branch.c:364
+#: branch.c:363
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "작업 폴더 %s의 헤드가 업데이트되지 않았습니다"
@@ -544,7 +1152,7 @@ msgstr "'%s' 파일이 버전2 번들 파일로 보이지 않습니다"
msgid "unrecognized header: %s%s (%d)"
msgstr "인식할 수 없는 헤더: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:778
+#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "'%s'을(를) 열 수 없습니다"
@@ -553,9 +1161,9 @@ msgstr "'%s'을(를) 열 수 없습니다"
msgid "Repository lacks these prerequisite commits:"
msgstr "저장소에 필수적인 다음 커밋이 없습니다:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
+#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "리비전 walk 준비가 실패했습니다"
@@ -593,7 +1201,7 @@ msgstr "rev-list 명령이 죽었습니다"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "알 수 없는 인자: %s"
@@ -616,8 +1224,8 @@ msgstr "index-pack 명령이 죽었습니다"
msgid "invalid color value: %.*s"
msgstr "잘못된 색 값: %.*s"
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
+#: builtin/am.c:2127
#, c-format
msgid "could not parse %s"
msgstr "parse %s을(를) 파싱할 수 없습니다"
@@ -627,6 +1235,16 @@ msgstr "parse %s을(를) 파싱할 수 없습니다"
msgid "%s %s is not a commit!"
msgstr "%s %s, 커밋이 아닙니다"
+#: commit.c:1514
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"경고: 커밋 메시지가 UTF-8 인코딩에 맞지 않습니다.\n"
+"메시지를 수정한 다음 커밋을 수정하거나, 설정의 i18n.commitencoding\n"
+"변수를 프로젝트가 사용 중인 인코딩으로 맞추십시오.\n"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "메모리 바닥남"
@@ -661,142 +1279,157 @@ msgstr "명령행 %2$s 안에 %1$d번 줄에 잘못된 설정"
msgid "bad config line %d in %s"
msgstr "%2$s 안에 %1$d번 줄에 잘못된 설정"
-#: config.c:660
-#, c-format
-msgid "bad numeric config value '%s' for '%s': out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): 범위 벗어남"
+#: config.c:655
+msgid "out of range"
+msgstr "범위를 벗어남"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "단위가 잘못됨"
#: config.c:661
#, c-format
-msgid "bad numeric config value '%s' for '%s': invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): 단위 잘못됨"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s'): %s"
-#: config.c:667
+#: config.c:666
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): 범위 벗어남"
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): %s"
-#: config.c:668
+#: config.c:669
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 블롭 %s): 단위 잘못됨"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): %s"
#: config.c:672
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): 범위 벗어남"
-
-#: config.c:673
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 파일 %s): 단위 잘못됨"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): %s"
-#: config.c:677
+#: config.c:675
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): 범위 벗어남"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): %s"
#: config.c:678
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 표준입력): 단위 잘못됨"
-
-#: config.c:682
-#, c-format
-msgid ""
-"bad numeric config value '%s' for '%s' in submodule-blob %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): 범위 벗어남"
-
-#: config.c:683
-#, c-format
-msgid ""
-"bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): 단위 잘못됨"
-
-#: config.c:687
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): 범위 벗어남"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): %s"
-#: config.c:688
+#: config.c:681
#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', 명령행 %s): 단위 잘못됨"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): %s"
-#: config.c:692
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: out of range"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): 범위 벗어남"
-
-#: config.c:693
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
-msgstr "잘못된 수치 설정 값 '%s' (키 '%s', %s 안에): 단위 잘못됨"
-
-#: config.c:780
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'"
-#: config.c:861 config.c:872
+#: config.c:852 config.c:863
#, c-format
msgid "bad zlib compression level %d"
msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다"
-#: config.c:990
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s"
-#: config.c:1324
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "명령행 설정을 파싱할 수 없습니다"
-#: config.c:1374
+#: config.c:1362
msgid "unknown error occurred while reading the configuration files"
msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다"
-#: config.c:1728
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "명령행 설정에서 '%s'을(를) 설정할 수 없습니다"
-#: config.c:1730
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니다"
-#: config.c:1789
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s은(는) 여러 개 값이 있습니다"
-#: config.c:2323
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다"
-#: config.c:2325
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' 설정을 지울 수 없습니다"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "리모트 측이 최초 연결했을 때 연결을 끊었습니다"
+
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"리모트 저장소에서 읽을 수 없습니다\n"
+"\n"
+"올바른 접근 권한이 있는지, 그리고 저장소가 있는지\n"
+"확인하십시오."
+
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "연결을 확인하는 중입니다"
-#: connected.c:74
+#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list'를 실행할 수 없습니다"
-#: connected.c:94
+#: connected.c:95
msgid "failed write to rev-list"
msgstr "rev-list 쓰기에 실패했습니다"
-#: connected.c:101
+#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr "rev-list의 표준입력을 닫는데 실패했습니다"
+#: convert.c:201
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"%s에서 CRLF는 LF로 바뀝니다.\n"
+"작업 디렉터리에서는 원래 줄 바꿈 형식을 유지합니다."
+
+#: convert.c:205
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "%s에서 CRLF는 LF로 바뀝니다."
+
+#: convert.c:211
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
+msgstr ""
+"%s에서 LF는 CRLF로 바뀝니다.\n"
+"작업 디렉터리에서는 원래 줄 바꿈 형식을 유지합니다."
+
+#: convert.c:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "%s에서 LF는 CRLF로 바뀝니다."
+
#: date.c:97
msgid "in the future"
msgstr "미래에"
@@ -861,26 +1494,31 @@ msgstr[0] "%lu년 전"
msgid "failed to read orderfile '%s'"
msgstr "'%s' 순서 파일을 읽는데 실패했습니다"
-#: diffcore-rename.c:540
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중"
-#: diff.c:116
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "'%s' 옵션에는 값이 필요합니다"
+
+#: diff.c:124
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n"
-#: diff.c:121
+#: diff.c:129
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 알 수 없는 dirstat 파라미터 '%s'\n"
-#: diff.c:225
+#: diff.c:283
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'"
-#: diff.c:277
+#: diff.c:346
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -889,16 +1527,21 @@ msgstr ""
"'diff.submodule' 설정 변수에 오류:\n"
"%s'"
-#: diff.c:3017
+#: diff.c:3087
#, c-format
msgid "external diff died, stopping at %s"
msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤"
-#: diff.c:3415
+#: diff.c:3412
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr ""
+"\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
+
+#: diff.c:3502
msgid "--follow requires exactly one pathspec"
msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다"
-#: diff.c:3578
+#: diff.c:3665
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -907,61 +1550,242 @@ msgstr ""
"--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n"
"%s"
-#: diff.c:3592
+#: diff.c:3679
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'"
-#: dir.c:1823
+#: diff.c:4700
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "파일이 너무 많아서 부정확한 이름 바꾸기 검색 기능을 건너뜁니다."
+
+#: diff.c:4703
+msgid "only found copies from modified paths due to too many files."
+msgstr "파일이 너무 많아서 수정한 경로의 복사본만 찾았습니다."
+
+#: diff.c:4706
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령을 다시 시도해 보십시오."
+
+#: dir.c:1866
msgid "failed to get kernel name and information"
msgstr "커널 이름과 정보를 가져오는데 실패했습니다"
-#: dir.c:1942
+#: dir.c:1985
msgid "Untracked cache is disabled on this system or location."
msgstr "이 시스템 또는 위치에서는 추적되지 않는 캐시를 사용하지 않습니다."
-#: gpg-interface.c:178
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: 얕은 목록을 예상함"
+
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
+
+#: fetch-pack.c:243
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
+
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc 옵션은 multi_ack_detailed가 필요합니다"
+
+#: fetch-pack.c:381
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "shallow 줄이 잘못됨: %s"
+
+#: fetch-pack.c:387
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "unshallow 줄이 잘못됨: %s"
+
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
+msgstr "오브젝트가 없습니다: %s"
+
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
+msgstr "오브젝트에 오류: %s"
+
+#: fetch-pack.c:394
+#, c-format
+msgid "no shallow found: %s"
+msgstr "shallow가 없습니다: %s"
+
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "shallow/unshallow가 와야 하지만, %s을(를) 받았습니다"
+
+#: fetch-pack.c:436
+#, c-format
+msgid "got %s %d %s"
+msgstr "받음: %s %d %s"
+
+#: fetch-pack.c:450
+#, c-format
+msgid "invalid commit %s"
+msgstr "잘못된 커밋 %s"
+
+#: fetch-pack.c:483
+msgid "giving up"
+msgstr "포기함"
+
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
+msgstr "완료"
+
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "받음: %s (%d) %s"
+
+#: fetch-pack.c:551
+#, c-format
+msgid "Marking %s as complete"
+msgstr "%s 항목을 완료로 표시"
+
+#: fetch-pack.c:697
+#, c-format
+msgid "already have %s (%s)"
+msgstr "이미 %s (%s) 있음"
+
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: 사이드밴드 디멀티플렉서를 fork할 수 없습니다"
+
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
+msgstr "프로토콜 오류: 잘못된 묶음 헤더"
+
+#: fetch-pack.c:799
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: %s 명령을 fork할 수 없습니다"
+
+#: fetch-pack.c:815
+#, c-format
+msgid "%s failed"
+msgstr "%s 실패"
+
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
+msgstr "사이드밴드 디멀티플렉서에 오류"
+
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
+msgstr "서버에서 shallow 클라이언트를 지원하지 않습니다"
+
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
+msgstr "서버에서 multi_ack_detailed를 지원합니다"
+
+#: fetch-pack.c:851
+msgid "Server supports no-done"
+msgstr "서버에서 no-done을 지원합니다"
+
+#: fetch-pack.c:857
+msgid "Serv