diff options
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 3 | ||||
| -rw-r--r-- | builtin/stripspace.c | 4 | ||||
| -rw-r--r-- | git-rebase--interactive.sh | 13 | ||||
| -rw-r--r-- | po/fr.po | 5020 | ||||
| -rw-r--r-- | po/git.pot | 4706 | ||||
| -rw-r--r-- | po/ko.po | 5221 | ||||
| -rw-r--r-- | po/pt_PT.po | 4990 | ||||
| -rw-r--r-- | po/ru.po | 4429 | ||||
| -rw-r--r-- | po/sv.po | 4967 | ||||
| -rw-r--r-- | po/vi.po | 4965 | ||||
| -rw-r--r-- | po/zh_CN.po | 4917 | ||||
| -rw-r--r-- | ref-filter.c | 2 | ||||
| -rw-r--r-- | sequencer.c | 2 | ||||
| -rwxr-xr-x | t/t0030-stripspace.sh | 9 | ||||
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 11 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 10 |
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 @@ -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" @@ -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 "" @@ -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 "Server supports multi_ack" +msgstr "서버에서 multi_ack를 지원합니다" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "서버에서 side-band-64k를 지원합니다" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "서버에서 side-band를 지원합니다" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "서버에서 allow-tip-sha1-in-want를 지원합니다" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "서버에서 allow-reachable-sha1-in-want를 지원합니다" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "서버에서 ofs-delta를 지원합니다" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "서버 버전이 %.*s입니다" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "서버에서 --shallow-signed 옵션을 지원하지 않습니다" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "서버에서 --shallow-exclude 옵션을 지원하지 않습니다" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "서버에서 --deepen 옵션을 지원하지 않습니다" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "공통 커밋 없음" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: 가져오기 실패." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "해당하는 리모트 헤드가 없습니다" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg에서 데이터를 서명하는데 실패했습니다." -#: gpg-interface.c:208 +#: gpg-interface.c:215 msgid "could not create temporary file" msgstr "임시 파일을 만들 수 없습니다" -#: gpg-interface.c:210 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다" -#: grep.c:1792 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s을(를) 읽을 수 없습니다" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "'%s'에 대해 stat()이 실패했습니다" -#: grep.c:1820 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "'%s': 읽다가 잘림" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "'%s'에 있는 깃 명령" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "다른 $PATH에 있는 깃 명령" -#: 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" @@ -970,11 +1794,11 @@ msgstr "" "'%s'은(는) 깃 명령으로 보이지만, 실행할 수\n" "없습니다. 아마도 git-%s 망가진 것 같습니다." -#: 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" @@ -983,17 +1807,17 @@ msgstr "" "경고: 이름이 '%s'인 깃 명령을 실행했지만, 그 명령이 없습니다.\n" "자동으로 '%s' 명령이라고 가정하고 계속합니다" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "(%0.1f초 뒤에)..." -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s'은(는) 깃 명령이 아닙니다. 'git --help'를 참고하십시오." -#: help.c:404 help.c:470 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -1004,11 +1828,37 @@ msgstr[0] "" "\n" "다음을 의도하신 것 아니었나요?" -#: help.c:466 +#: help.c:461 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: ident.c:334 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" +"\n" +"*** 내가 누구인지 설정하십시오.\n" +"\n" +"다음을 실행하면,\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"내 이름\"\n" +"\n" +"계정의 기본 신원 정보를 설정합니다.\n" +"--global 옵션을 빼면 이 저장소서만 신원 정보를 설정합니다.\n" +"\n" + #: lockfile.c:152 #, c-format msgid "" @@ -1037,78 +1887,78 @@ msgstr "'%s.lock'을 만들 수 없습니다: %s" 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 "새 인덱스 파일을 쓸 수 없습니다" -#: merge-recursive.c:212 +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "(잘못된 커밋)\n" -#: merge-recursive.c:234 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "'%s' 경로에 대해 addinfo_cache가 실패했습니다" -#: merge-recursive.c:304 +#: merge-recursive.c:301 msgid "error building trees" msgstr "트리 빌드에 오류" -#: merge-recursive.c:723 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s' 경로 만들기에 실패했습니다%s" -#: merge-recursive.c:734 +#: merge-recursive.c:731 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "하위 디렉터리에 공간을 만드려고 %s을(를) 제거합니다\n" -#: merge-recursive.c:748 merge-recursive.c:767 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr ": 아마도 D/F 충돌?" -#: merge-recursive.c:757 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' 위치의 추적되지 않는 파일을 잃기를 거부합니다" -#: merge-recursive.c:799 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' 오브젝트를 읽을 수 없음" -#: merge-recursive.c:801 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s'에 대해 블롭을 예상" -#: merge-recursive.c:825 +#: merge-recursive.c:822 #, c-format msgid "failed to open '%s': %s" msgstr "'%s'을(를) 여는데 실패: %s" -#: merge-recursive.c:836 +#: merge-recursive.c:833 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' 심볼릭 링크에 실패: %s" -#: merge-recursive.c:841 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "다음을 어떻게 할지 알 수 없습니다: %06o %s '%s'" -#: merge-recursive.c:981 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "내부 병합 실행에 실패" -#: merge-recursive.c:985 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "%s을(를) 데이터베이스에 추가할 수 없습니다" -#: merge-recursive.c:1084 merge-recursive.c:1098 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1116,7 +1966,7 @@ msgid "" msgstr "" "충돌! (%s/삭제): %s (위치 %s) 및 %s (%s에서) 삭제. %s 버전의 %s 트리에 남음." -#: merge-recursive.c:1090 merge-recursive.c:1103 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1125,20 +1975,20 @@ msgstr "" "충돌! (%s/삭제): %s (위치 %s) 및 %s (위치 %s) 삭제. %s 버전의 %s 트리에 " "%s(으)로 남음." -#: merge-recursive.c:1146 +#: merge-recursive.c:1143 msgid "rename" msgstr "이름바꾸기" -#: merge-recursive.c:1146 +#: merge-recursive.c:1143 msgid "renamed" msgstr "이름바꿈" -#: merge-recursive.c:1203 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s은(는) %s에 있는 디렉터리로 %s(으)로 이름을 바꿉니다" -#: merge-recursive.c:1228 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -1147,139 +1997,155 @@ msgstr "" "충돌! (이름바꾸기/이름바꾸기): \"%3$s\" 브랜치에서 이름바꾸기 \"%1$s\"->" "\"%2$s\" \"%6$s\" 브랜치에서 이름 바꾸기 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1233 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (해결되지 않음)" -#: merge-recursive.c:1295 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "충돌! (rename/rename): 이름 바꾸기 %s->%s (위치 %s). 이름 바꾸기 %s->%s (위" "치 %s)" -#: merge-recursive.c:1328 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "대신 이름을 %s에서 %s(으)로 바꾸고 %s에서 %s(으)로 바꿉니다" -#: merge-recursive.c:1534 +#: merge-recursive.c:1531 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "충돌! (rename/add): 이름 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)" -#: merge-recursive.c:1549 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "병합된 %s을(를) 추가합니다" -#: merge-recursive.c:1556 merge-recursive.c:1769 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "대신 %s(으)로 추가합니다" -#: merge-recursive.c:1613 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "%s 오브젝트를 읽을 수 없습니다" -#: merge-recursive.c:1616 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" msgstr "%s 오브젝트는 블롭이 아닙니다" -#: merge-recursive.c:1669 +#: merge-recursive.c:1666 msgid "modify" msgstr "수정" -#: merge-recursive.c:1669 +#: merge-recursive.c:1666 msgid "modified" msgstr "수정됨" -#: merge-recursive.c:1679 +#: merge-recursive.c:1676 msgid "content" msgstr "내용" -#: merge-recursive.c:1686 +#: merge-recursive.c:1683 msgid "add/add" msgstr "추가/추가" -#: merge-recursive.c:1721 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "건너뛰기: %s (기존과 같게 병합)" -#: merge-recursive.c:1735 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "자동 병합: %s" -#: merge-recursive.c:1739 git-submodule.sh:919 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "하위 모듈" -#: merge-recursive.c:1740 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "충돌! (%s): %s에 병합 충돌" -#: merge-recursive.c:1834 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "제거: %s" -#: merge-recursive.c:1860 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "파일/디렉터리" -#: merge-recursive.c:1866 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "디렉터리/파일" -#: merge-recursive.c:1871 +#: merge-recursive.c:1868 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "충돌! (%s): 이름이 %s인 디렉터리가 %s에 있습니다. %s을(를) %s(으)로 추가합니" "다" -#: merge-recursive.c:1880 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "추가: %s" -#: merge-recursive.c:1917 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "이미 업데이트 상태입니다!" -#: merge-recursive.c:1926 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s 및 %s 트리의 병합이 실패했습니다" -#: merge-recursive.c:2009 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "병합:" -#: merge-recursive.c:2022 +#: merge-recursive.c:2019 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "과거의 공통 커밋 %u개 발견:" -#: merge-recursive.c:2061 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "병합 결과에 커밋이 없습니다" -#: merge-recursive.c:2124 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' 오브젝트를 파싱할 수 없습니다" -#: merge-recursive.c:2138 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "인덱스를 쓸 수 없습니다." +#: notes-merge.c:273 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" +"이전의 노트 병합을 다 마치지 않았습니다 (%s 있음).\n" +"새로 노트 병합을 시작하기 전에 'git notes merge --commit'\n" +"또는 'git notes merge --abort'로 이전 병합을 커밋/중지하십시오." + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "노트 병합 작업을 다 마치지 않았습니다. (%s 있음)" + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "초기화하지 않았거나 레퍼런스하지 않은 notes 트리를 커밋할 수 없습니다" @@ -1336,7 +2202,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "잘못된 형식의 오브젝트 이름 '%s'" -#: path.c:796 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다" @@ -1391,12 +2257,20 @@ msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니다: %s" -#: pathspec.c:433 +#: pathspec.c:408 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" +msgstr "" +"경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모" +"든 경로를 지정하려면 점(.)을 사용하십시오." + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "'%s' 경로명세는 심볼릭 링크 아래에 있습니다" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1404,15 +2278,11 @@ msgstr "" ":(exclude) 패턴으로 제외할 사항이 없습니다.\n" "':/' 또는 '.' 추가를 잊으신 것 아닙니까?" -#: pretty.c:973 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "--pretty 형식을 파싱할 수 없습니다" -#: progress.c:235 -msgid "done" -msgstr "완료" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1421,7 +2291,7 @@ msgstr "" "index.version이 설정되었지만, 이 값이 잘못되었습니다.\n" "%i 버전을 사용합니다" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1430,22 +2300,22 @@ msgstr "" "GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n" "%i 버전을 사용합니다" -#: refs.c:551 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s" -#: refs/files-backend.c:2537 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "레퍼런스를 삭제할 수 없습니다: %s" -#: refs/files-backend.c:2546 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "%s 레퍼런스를 제거할 수 없습니다" @@ -1574,12 +2444,12 @@ msgstr "망가진 이름 %s에 레퍼런스를 무시합니다" msgid "ignoring broken ref %s" msgstr "망가진 레퍼런스 %s 무시" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "형식: %%(end) 아톰이 없습니다" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "잘못된 형식의 오브젝트 이름 %s" @@ -1697,52 +2567,60 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n" -#: revision.c:2132 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "현재 브랜치가 망가진 것처럼 보입니다" -#: revision.c:2135 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다" -#: revision.c:2329 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "/dev/null 열기 실패" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) 실패" -#: send-pack.c:298 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "푸시 인증서 서명에 실패했습니다" -#: send-pack.c:411 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "받는 쪽에서 --signed 푸시를 지원하지 않습니다" -#: send-pack.c:413 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" "받는 쪽에서 --signed 푸시를 지원하지 않으므로 푸시 인증서를 보내지 않습니다" -#: send-pack.c:425 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "받는 쪽에서 --atomic 푸시를 지원하지 않습니다" -#: send-pack.c:430 +#: send-pack.c:429 msgid "the receiving end does not support push options" msgstr "받는 쪽에서 푸시 옵션을 지원하지 않습니다" -#: sequencer.c:174 +#: sequencer.c:171 +msgid "revert" +msgstr "되돌리기" + +#: sequencer.c:171 +msgid "cherry-pick" +msgstr "빼오기" + +#: sequencer.c:228 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1750,7 +2628,7 @@ msgstr "" "이 충돌을 해결한 뒤에, 바로잡은 경로를\n" "'git add <경로>' 또는 'git rm <경로>'로 표시하십시오" -#: sequencer.c:177 +#: sequencer.c:231 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1760,230 +2638,258 @@ msgstr "" "'git add <경로>' 또는 'git rm <경로>'로 표시하십시오.\n" "그리고 결과물을 'git commit'으로 커밋하십시오" -#: sequencer.c:190 sequencer.c:841 sequencer.c:924 +#: sequencer.c:244 sequencer.c:1209 #, c-format -msgid "Could not write to %s" -msgstr "%s에 쓸 수 없습니다" +msgid "could not lock '%s'" +msgstr "'%s'을(를) 잠글 수 없습니다" + +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#, c-format +msgid "could not write to '%s'" +msgstr "'%s'에 쓸 수 없습니다" + +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s" +msgstr "'%s'에 줄바꿈을 쓸 수 없습니다" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 #, c-format -msgid "Error wrapping up %s." -msgstr "%s 잠그는데 오류." +msgid "failed to finalize '%s'." +msgstr "'%s' 마치는데 실패했습니다" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "로컬 변경 사항을 cherry-pick 때문에 덮어 쓰게 됩니다." +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "'%s'에서 읽을 수 없습니다" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "로컬 변경 사항을 revert 때문에 덮어 쓰게 됩니다." +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다." -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "변경 사항을 스테이징하거나 스태시한 다음 계속하십시오." +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "변경 사항을 커밋하거나 스태시한 다음 계속하십시오." -#: sequencer.c:228 +#: sequencer.c:324 #, c-format msgid "%s: fast-forward" msgstr "%s: 정방향 진행" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:303 +#: sequencer.c:399 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: 새 인덱스 파일을 쓸 수 없습니다" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" msgstr "HEAD 커밋을 처리할 수 없습니다\n" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" +#: sequencer.c:438 +msgid "unable to update cache tree\n" msgstr "캐시 트리를 업데이트할 수 없습니다\n" -#: sequencer.c:393 +#: sequencer.c:483 #, c-format -msgid "Could not parse commit %s\n" +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"작업 폴더에 스테이징한 변경 사항이 있습니다.\n" +"이 변경 사항을 이전 커밋에 합치려면,\n" +"다음을 실행하십시오:\n" +"\n" +" git commit --amend %s\n" +"\n" +"새 커밋으로 만드려면 다음을 실행하십시오:\n" +"\n" +" git commit %s\n" +"\n" +"어떤 경우이든, 마친 다음에 다음 명령으로 계속합니다:\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:567 +#, c-format +msgid "could not parse commit %s\n" msgstr "%s 커밋을 파싱할 수 없습니다\n" -#: 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 "%s 이전 커밋을 파싱할 수 없습니다\n" -#: 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 "%s 커밋은 병합이지만 -m 옵션이 주어지지 않았습니다." # FIXME: "parent %d" 번호가 무슨 의미? -#: sequencer.c:490 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Commit %s 커밋에 이전 커밋 %d이(가) 없습니다" +msgid "commit %s does not have parent %d" +msgstr "%s 커밋에 이전 커밋 %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 "메인라인을 지정했지만 %s 커밋이 병합 커밋이 아닙니다." -#. 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: %s 이전 커밋을 파싱할 수 없습니다" -#: sequencer.c:511 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" +msgid "cannot get commit message for %s" msgstr "%s에 대한 커밋 메시지를 가져올 수 없습니다" -#: sequencer.c:597 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "다음을 되돌릴(revert) 수 없습니다: %s... %s" -#: sequencer.c:598 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "다음을 적용할(apply) 수 없습니다: %s... %s" -#: sequencer.c:633 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "빈 커밋 모음을 건너 뜁니다" -#: sequencer.c:641 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: 인덱스 읽기에 실패했습니다" -#: sequencer.c:645 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: 인덱스 새로 고침에 실패했습니다" -#: sequencer.c:705 -msgid "Cannot revert during a another revert." -msgstr "되돌리는(revert) 중에 또 다른 되돌리기를 할 수 없습니다." - -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다." - -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "되돌리기(revert) 중에 빼오기(cherry-pick)를 할 수 없습니다" - -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "빼오기(revert) 중에 또 다른 빼오기를 할 수 없습니다" - -#: sequencer.c:732 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "%d번 줄을 파싱할 수 없습니다." +msgid "invalid line %d: %.*s" +msgstr "잘못된 줄 %d: %.*s" -#: sequencer.c:737 -msgid "No commits parsed." +#: sequencer.c:950 +msgid "no commits parsed." msgstr "파싱한 커밋이 없습니다." -#: sequencer.c:749 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "%s을(를) 열 수 없습니다" +msgid "could not read '%s'." +msgstr "'%s'에서 읽을 수 없습니다." -#: sequencer.c:753 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "%s을(를) 읽을 수 없습니다." +msgid "unusable instruction sheet: '%s'" +msgstr "사용 불가능 인스트럭션 시트: '%s'" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "사용 불가능 인스트럭션 파일: %s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "되돌리기(revert) 중에 빼오기(cherry-pick)를 할 수 없습니다." -#: sequencer.c:790 +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다." + +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" +msgid "invalid key: %s" msgstr "잘못된 키: %s" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "%s의 값이 올바르지 않습니다: %s" +msgid "invalid value for %s: %s" +msgstr "%s의 값이 잘못됨: %s" -#: sequencer.c:803 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "형식이 잘못된 옵션 파일: %s" +msgid "malformed options sheet: '%s'" +msgstr "형식이 잘못된 옵션 시트: '%s'" -#: sequencer.c:822 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "이미 커밋 빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중입니다" -#: sequencer.c:823 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십시오" -#: sequencer.c:827 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다" +msgid "could not create sequencer directory '%s'" +msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다" + +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "HEAD를 잠글 수 없습니다" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다" -#: sequencer.c:864 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "HEAD를 구해 올 수 없습니다" -#: sequencer.c:866 sequencer.c:900 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다" -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 +#: sequencer.c:1175 builtin/grep.c:578 #, c-format -msgid "cannot open %s" -msgstr "%s을(를) 열 수 없습니다" +msgid "cannot open '%s'" +msgstr "'%s'을(를) 열 수 없습니다" -#: sequencer.c:888 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "%s을(를) 읽을 수 없습니다: %s" +msgid "cannot read '%s': %s" +msgstr "'%s'을(를) 읽을 수 없습니다: %s" -#: sequencer.c:889 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "예상치 못하게 파일이 끝났습니다" -#: sequencer.c:895 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다" -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "%s에 포매팅할 수 없습니다." - -#: sequencer.c:1066 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s 커밋을 빼올 수 없습니다" -#: sequencer.c:1069 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: 잘못된 리비전" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "최초의 커밋을 되돌릴 수 없습니다" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "최초의 커밋으로 되돌릴 수 없습니다" #: setup.c:160 #, c-format @@ -2016,11 +2922,6 @@ msgstr "" "경로와 리비전을 구분하려면 다음과 같이 '--'를 사용하십시오:\n" "'git <명령> [<리비전>...] -- [<파일>...]'" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "%s을(를) 읽는데 실패했습니다" - #: setup.c:468 #, c-format msgid "Expected git repo version <= %d, found %d" @@ -2050,7 +2951,8 @@ msgid "" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "(현재 폴더 또는 마운트 위치 %s까지 상위 폴더가) 깃 저장소가 아닙니다\n" -"파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않음)" +"파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않" +"음)" #: setup.c:927 #, c-format @@ -2066,21 +2968,56 @@ msgstr "" "core.sharedRepository 파일모드 값에 (0%.3o) 문제가 있습니다.\n" "파일의 소유자에 읽기와 쓰기 권한이 있어야 합니다." -#: sha1_file.c:1046 +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "'%s' 경로가 없습니다" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다." + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)" -#: sha1_file.c:2434 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)" -#: sha1_file.c:2438 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "짧은 SHA1 %s은(는) 여럿에 대응됩니다" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "후보는 다음과 같습니다:" + +#: sha1_name.c:578 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -2126,7 +3063,7 @@ msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다" msgid "staging updated .gitmodules failed" msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다" @@ -2135,56 +3072,56 @@ msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다" msgid "invalid value for %s" msgstr "%s의 값이 올바르지 않습니다" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "트레일러 명령 '%s' 실행 실패" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 +#: trailer.c:541 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "알 수 없는 값 '%s', 키 '%s'" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "%s이(가) 여러개입니다" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "트레일러 '%.*s'에서 빈 트레일러 토큰" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "'%s' 입력 파일을 읽을 수 없습니다" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "표준 입력에서 읽을 수 없습니다" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "%s에 대해 stat()할 수 없습니다" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "'%s' 파일이 일반 파일이 아닙니다" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "사용자가 %s 파일에 쓸 수 없습니다" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "임시 파일을 열 수 없습니다: %s" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다" @@ -2199,7 +3136,7 @@ msgstr "'%1$s'의 업스트림을 '%3$s'의 '%2$s'(으)로 설정할 것입니 msgid "transport: invalid depth option '%s'" msgstr "transport: 잘못된 깊이 옵션: %s" -#: transport.c:771 +#: transport.c:817 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -2208,7 +3145,7 @@ msgstr "" "다음 하위 모듈 경로에 리모트 어디에도 없는\n" "변경 사항이 있습니다:\n" -#: transport.c:775 +#: transport.c:821 #, c-format msgid "" "\n" @@ -2235,15 +3172,31 @@ msgstr "" "명령을 시도해 보십시오\n" "\n" -#: transport.c:783 +#: transport.c:829 msgid "Aborting." msgstr "중지함." -#: transport-helper.c:1041 +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "%s 레퍼런스를 읽을 수 없습니다" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "너무 짧은 트리 오브젝트" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "트리 엔트리에 잘못된 형식의 모드" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "트리 엔트리에 빈 파일 이름" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "너무 짧은 트리 파일" + #: unpack-trees.c:64 #, c-format msgid "" @@ -2426,13 +3379,14 @@ msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" "%s" msgstr "" -"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않았습니다:\n" +"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않" +"았습니다:\n" "%s" #: 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 "" @@ -2443,7 +3397,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 "" @@ -2499,14 +3453,14 @@ msgstr "'%s'을(를) 읽는데 실패했습니다" msgid "could not open '%s' for reading and writing" msgstr "읽기와 쓰기용으로 '%s'을(를) 열 수 없습니다" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 -#: builtin/pull.c:407 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "'%s'을(를) 읽기용으로 열 수 없습니다" @@ -2530,146 +3484,146 @@ msgstr "%s에 쓸 수 없습니다" msgid "could not close %s" msgstr "%s을(를) 닫을 수 없습니다" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "병합하지 않은 경로:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (스테이지 해제하려면 \"git reset %s <파일>...\"을 사용하십시오)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (스테이지 해제하려면 \"git rm --cached <파일>...\"을 사용하십시오)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (해결했다고 표시하려면 \"git add <파일>...\"을 사용하십시오)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (해결했다고 표시하려면 알맞게 \"git add/rm <파일>...\"을 사용하십시오)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (해결했다고 표시하려면 \"git rm <파일>...\"을 사용하십시오)" -#: wt-status.c:198 wt-status.c:882 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "커밋할 변경 사항:" -#: wt-status.c:216 wt-status.c:891 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "커밋하도록 정하지 않은 변경 사항:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (무엇을 커밋할지 바꾸려면 \"git add <파일>...\"을 사용하십시오)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (무엇을 커밋할지 바꾸려면 \"git add/rm <파일>...\"을 사용하십시오)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (작업 폴더의 변경 사항을 버리려면 \"git checkout -- <파일>...\"을 사용하십" "시오)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (하위 모듈의 추적되지 않는 파일이나 수정된 내용을 커밋하거나 버리십시오)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (커밋할 사항에 포함하려면 \"git %s <파일>...\"을 사용하십시오)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "양쪽에서 삭제:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "이 쪽에서 추가:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "저 쪽에서 삭제:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "저 쪽에서 추가:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "이 쪽에서 삭제:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "양쪽에서 추가:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "양쪽에서 수정:" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "새 파일:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "복사함:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "삭제함:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "수정함:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "이름 바꿈:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "종류 바뀜:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "알 수 없음:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "병합하지 않음:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "새 커밋, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "수정한 내용, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "추적하지 않은 내용, " -#: wt-status.c:756 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "변경되었지만 업데이트하지 않은 하위 모듈:" -#: wt-status.c:758 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "커밋할 하위 모듈의 변경 사항:" -#: wt-status.c:839 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2677,219 +3631,219 @@ msgstr "" "위의 줄을 바꾸지 마십시오.\n" "아래 있는 내용은 모두 제거됩니다." -#: wt-status.c:950 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "병합하지 않은 경로가 있습니다." -#: wt-status.c:953 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (충돌을 바로잡고 \"git commit\"을 실행하십시오)" -#: wt-status.c:955 +#: wt-status.c:1018 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (병합을 중단하려면 \"git merge --abort\"를 사용하십시오)" -#: wt-status.c:960 +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "모든 충돌을 바로잡았지만 아직 병합하는 중입니다." -#: wt-status.c:963 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (병합을 마무리하려면 \"git commit\"을 사용하십시오)" -#: wt-status.c:973 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "am 세션 중간에 있습니다." -#: wt-status.c:976 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "현재 패치가 비어 있습니다." -#: wt-status.c:980 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (충돌을 바로잡은 다음 \"git am --continue\"를 사용하십시오)" -#: wt-status.c:982 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시오)" -#: wt-status.c:984 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)" -#: wt-status.c:1109 +#: wt-status.c:1172 msgid "No commands done." msgstr "완료한 명령 없음." -#: wt-status.c:1112 +#: wt-status.c:1175 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "최근 완료한 명령 (%d개 명령 완료):" -#: wt-status.c:1123 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " (자세한 정보는 %s 파일 참고)" -#: wt-status.c:1128 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "명령이 남아있지 않음." -#: wt-status.c:1131 +#: wt-status.c:1194 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "다음에 할 명령 (%d개 명령 남음):" -#: wt-status.c:1139 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)" -#: wt-status.c:1152 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중입니다." -#: wt-status.c:1157 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "현재 리베이스하는 중입니다." -#: wt-status.c:1171 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (충돌을 바로잡고 \"git rebase --continue\"를 사용하십시오)" -#: wt-status.c:1173 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (이 패치를 건너뛰려면 \"git rebase --skip\"을 사용하십시오)" -#: wt-status.c:1175 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (원본 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)" -#: wt-status.c:1181 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (모든 충돌을 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)" -#: wt-status.c:1185 +#: wt-status.c:1248 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 분리하는 중입니다." -#: wt-status.c:1190 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "현재 리베이스하는 중 커밋을 분리하는 중입니다." -#: wt-status.c:1193 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (작업 폴더가 깨끗해지면, \"git rebase --continue\"를 실행하십시오)" -#: wt-status.c:1197 +#: wt-status.c:1260 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "'%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 편집하는 중입니다." -#: wt-status.c:1202 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "리베이스 중에 커밋을 편집하는 중입니다." -#: wt-status.c:1205 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (현재 커밋을 수정하려면 \"git commit --amend\"을 사용하십시오)" -#: wt-status.c:1207 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (변경 사항에 만족할 때 \"git rebase --continue\"를 사용하십시오)" -#: wt-status.c:1217 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "현재 %s 커밋을 뽑아 내고 있습니다." -#: wt-status.c:1222 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (충돌을 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)" -#: wt-status.c:1225 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (모든 충돌을 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)" -#: wt-status.c:1227 +#: wt-status.c:1290 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (뽑기 작업을 취소하려면 \"git cherry-pick --abort\"를 사용하십시오)" -#: wt-status.c:1236 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "현재 %s 커밋을 되돌리는 중입니다." -#: wt-status.c:1241 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (충돌을 바로잡고 \"git revert --continue\"를 실행하십시오)" -#: wt-status.c:1244 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (모든 충돌을 바로잡았습니다: \"git revert --continue\"를 실행하십시오)" -#: wt-status.c:1246 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (되돌리기 작업을 취소하려면 \"git revert --abort\"를 사용하십시오)" -#: wt-status.c:1257 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "'이등분하는 중입니다. '%s' 브랜치부터 시작." -#: wt-status.c:1261 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "'이등분하는 중입니다." -#: wt-status.c:1264 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (원래 브랜치로 돌아가려면 \"git bisect reset\"을 사용하십시오)" -#: wt-status.c:1464 +#: wt-status.c:1524 msgid "On branch " msgstr "현재 브랜치 " -#: wt-status.c:1470 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "대화형 리베이스 진행 중. 갈 위치는 " -#: wt-status.c:1472 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "리베이스 진행 중. 갈 위치는 " -#: wt-status.c:1477 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "HEAD가 다음 위치에서 분리: " -#: wt-status.c:1479 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "HEAD가 다음으로부터 분리: " -#: wt-status.c:1482 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "현재 어떤 브랜치도 사용하지 않음." -#: wt-status.c:1500 +#: wt-status.c:1560 msgid "Initial commit" msgstr "최초 커밋" -#: wt-status.c:1514 +#: wt-status.c:1574 msgid "Untracked files" msgstr "추적하지 않는 파일" -#: wt-status.c:1516 +#: wt-status.c:1576 msgid "Ignored files" msgstr "무시한 파일" -#: wt-status.c:1520 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2900,20 +3854,20 @@ msgstr "" "'status -uno' 옵션을 쓰면 빨라질 수도 있지만, 새 파일을\n" "직접 찾아서 추가해야 합니다. ('git help status' 참고)" -#: wt-status.c:1526 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "추적하지 않는 파일을 보지 않습니다%s" -#: wt-status.c:1528 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr " (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)" -#: wt-status.c:1534 +#: wt-status.c:1594 msgid "No changes" msgstr "변경 사항 없음" -#: wt-status.c:1539 +#: wt-status.c:1599 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" @@ -2921,12 +3875,12 @@ msgstr "" "\"를\n" "사용하십시오)\n" -#: wt-status.c:1542 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "커밋할 변경 사항을 추가하지 않았습니다\n" -#: wt-status.c:1545 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2936,55 +3890,70 @@ msgstr "" "\"git\n" "add\"를 사용하십시오)\n" -#: wt-status.c:1548 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다\n" -#: wt-status.c:1551 +#: wt-status.c:1611 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "커밋할 사항 없음 (파일을 만들거나 복사하고 \"git add\"를 사용하면 추적합니" "다)\n" -#: wt-status.c:1554 wt-status.c:1559 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "커밋할 사항 없음\n" -#: wt-status.c:1557 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "커밋할 사항 없음 (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)\n" -#: wt-status.c:1561 +#: wt-status.c:1621 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n" -#: wt-status.c:1668 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "최초 커밋, 브랜치: " -#: wt-status.c:1672 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (브랜치 없음)" -#: wt-status.c:1701 +#: wt-status.c:1761 msgid "gone" msgstr "없음" -#: wt-status.c:1703 wt-status.c:1711 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "다음 뒤에: " -#: wt-status.c:1706 wt-status.c:1709 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "다음 앞에: " -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "%s 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "%s 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "'%s' 파일 삭제에 실패했습니다" @@ -2993,272 +3962,257 @@ msgstr "'%s' 파일 삭제에 실패했습니다" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<옵션>] [--] <경로명세>..." -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "예상치 못한 diff 상태 %c" -#: builtin/add.c:71 builtin/commit.c:281 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "파일 업데이트가 실패했습니다" -#: builtin/add.c:81 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "'%s' 제거\n" -#: builtin/add.c:136 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:" -#: builtin/add.c:196 builtin/rev-parse.c:811 +#: builtin/add.c:209 builtin/rev-parse.c:840 msgid "Could not read the index" msgstr "인덱스를 읽을 수 없습니다" -#: builtin/add.c:207 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "'%s' 파일을 쓰기용으로 열 수 없습니다." -#: builtin/add.c:211 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "패치를 쓸 수 없습니다" -#: builtin/add.c:214 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "패치 편집에 실패했습니다" -#: builtin/add.c:217 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "'%s'을(를) stat()할 수 없습니다" -#: builtin/add.c:219 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "빈 패치. 중지." -#: builtin/add.c:224 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "'%s'을(를) 적용할 수 없습니다" -#: builtin/add.c:234 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "다음 경로는 .gitignore 파일 중 하나 때문에 무시합니다:\n" -#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 -#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "가짜로 실행" -#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 -#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 -#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "자세히 표시" - -#: builtin/add.c:256 +#: builtin/add.c:269 msgid "interactive picking" msgstr "대화식으로 고릅니다" -#: builtin/add.c:257 builtin/checkout.c:1156 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 "현재 diff를 편집하고 적용합니다" -#: builtin/add.c:259 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "무시하는 파일의 추가를 허용합니다" -#: builtin/add.c:260 +#: builtin/add.c:273 msgid "update tracked files" msgstr "추적되는 파일을 업데이트합니다" -#: builtin/add.c:261 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "나중에 추가할 것이라는 사실만 기록합니다" -#: builtin/add.c:262 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "추적되고 추적되지 않는 모든 파일의 변경 사항을 추가합니다" -#: builtin/add.c:265 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "작업 폴더에서 제거한 경로를 무시합니다 (--no-all과 동일)" -#: builtin/add.c:267 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "추가하지 않고 인덱스만 새로 고칩니다" -#: builtin/add.c:268 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "오류 때문에 추가할 수 없는 파일을 건너뜁니다" -#: builtin/add.c:269 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "가짜로 실행했을 때 파일을 무시하는지 확인합니다" -#: builtin/add.c:270 builtin/update-index.c:958 +#: builtin/add.c:283 builtin/update-index.c:947 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:270 builtin/update-index.c:959 +#: builtin/add.c:283 builtin/update-index.c:948 msgid "override the executable bit of the listed files" msgstr "목록의 파일에서 실행 가능 비트를 바꿉니다" -#: builtin/add.c:292 +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "정말로 추가하려면 -f 옵션을 사용하십시오.\n" -#: builtin/add.c:300 +#: builtin/add.c:312 msgid "adding files failed" msgstr "파일 추가가 실패했습니다" -#: builtin/add.c:336 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A 및 -u 옵션은 서로 호환되지 않습니다" -#: builtin/add.c:343 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "--ignore-missing 옵션은 --dry-run 옵션과 같이 사용할 경우에만 쓸 수 있습니다." -#: builtin/add.c:352 +#: builtin/add.c:359 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod 파라미터 '%s'은(는) -x 또는 +x 형식이어야 합니다" -#: builtin/add.c:367 +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "아무 것도 지정하지 않았으므로 아무 것도 추가하지 않습니다.\n" -#: builtin/add.c:368 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "'git add .' 명령을 실행하려고 한 것 아니었습니까?\n" -#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 +#: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "인덱스 파일이 손상되었습니다" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "새 인덱스 파일에 쓸 수 없습니다" - -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "'%s'에서 읽을 수 없습니다" - -#: builtin/am.c:426 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "작성자 스크립트를 파싱할 수 없습니다" -#: builtin/am.c:503 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "applypatch-msg 훅 때문에 '%s'이(가) 삭제되었습니다." -#: builtin/am.c:544 builtin/notes.c:301 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "잘못된 형식의 입력 줄: '%s'." -#: builtin/am.c:581 builtin/notes.c:316 +#: builtin/am.c:569 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다" -#: builtin/am.c:607 +#: builtin/am.c:595 msgid "fseek failed" msgstr "fseek 실패" -#: builtin/am.c:787 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "'%s' 패치를 파싱할 수 없습니다" -#: builtin/am.c:852 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "한번에 하나의 StGIT 패치 시리즈만 적용할 수 있습니다" -#: builtin/am.c:899 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "시각이 잘못되었습니다" -#: builtin/am.c:902 builtin/am.c:910 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "Date 줄이 잘못되었습니다" -#: builtin/am.c:907 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "시간대 오프셋이 잘못되었습니다" -#: builtin/am.c:996 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "패치 형식 검색이 실패했습니다." -#: builtin/am.c:1001 builtin/clone.c:380 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' 디렉터리 만들기가 실패했습니다" -#: builtin/am.c:1005 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "패치를 쪼개는데 실패했습니다." -#: builtin/am.c:1137 builtin/commit.c:366 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "인덱스 파일을 쓸 수 없습니다" -#: builtin/am.c:1188 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "이 문제를 해결했을 때 \"%s --continue\"를 실행하십시오." -#: builtin/am.c:1189 +#: builtin/am.c:1177 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "이 패치를 건너뛰려면, 그 대신 \"%s --skip\"을 실행하십시오." -#: builtin/am.c:1190 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "원래 브랜치를 복구하고 패치 적용을 중지하려면 \"%s --abort\"를 실행하십시오." -#: builtin/am.c:1328 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?" -#: builtin/am.c:1402 builtin/log.c:1543 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "잘못된 신원 줄: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "%s 커밋을 파싱할 수 없습니다" -#: builtin/am.c:1602 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다." -#: 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." @@ -3266,38 +4220,38 @@ msgstr "" "패치를 직접 편집하셨습니까?\n" "이 패치는 인덱스에 기록된 블롭에는 적용되지 않습니다." -#: builtin/am.c:1629 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "베이스 패치 적용 및 3-방향 병합으로 대신합니다..." -#: builtin/am.c:1654 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "변경 사항에서 병합하는데 실패했습니다." -#: builtin/am.c:1679 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree가 트리를 쓰는데 실패했습니다" -#: builtin/am.c:1686 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "빈 커밋 내역에 대해 적용합니다" -#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 #: builtin/merge.c:823 msgid "failed to write commit object" msgstr "커밋 오브젝트를 쓰는데 실패했습니다" -#: builtin/am.c:1731 builtin/am.c:1735 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format msgid "cannot resume: %s does not exist." msgstr "다시 시작할 수 없습니다: %s이(가) 없습니다." -#: builtin/am.c:1751 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "터미널에 표준 입력이 연결되지 않은 상태에서 대화형으로 실행할 수 없습니다." -#: builtin/am.c:1756 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "커밋 본문은:" @@ -3305,35 +4259,35 @@ 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 "적용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모두 적용[a]: " -#: builtin/am.c:1816 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "변경된 인덱스: 패치를 적용할 수 없습니다 (dirty: %s)" -#: builtin/am.c:1853 builtin/am.c:1925 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "적용하는 중: %.*s" -#: builtin/am.c:1869 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "변경 사항 없음 -- 패치가 이미 적용되었습니다." -#: builtin/am.c:1877 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "패치가 %s %.*s 위치에서 실패했습니다" -#: builtin/am.c:1883 +#: builtin/am.c:1891 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "실패한 패치의 복사본이 다음 위치에 있습니다: %s" -#: builtin/am.c:1928 +#: builtin/am.c:1936 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -3343,7 +4297,7 @@ msgstr "" "커밋으로 표시할 사항이 남아 있지 않으면, 이미 같은 패치에서 적용된\n" "경우일 수도 있습니다. 그런 경우에는 이 패치를 건너뛰면 됩니다." -#: builtin/am.c:1935 +#: builtin/am.c:1943 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -3351,17 +4305,17 @@ msgstr "" "인덱스에 병합하지 않은 경로가 남아 있습니다.\n" "'git add' 사용을 잊지 않으셨습니까?" -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' 오브젝트를 파싱할 수 없습니다." -#: builtin/am.c:2095 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "인덱스 지우기에 실패했습니다" -#: builtin/am.c:2129 +#: builtin/am.c:2137 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -3369,157 +4323,136 @@ msgstr "" "마지막 'am' 실패 이후 HEAD를 옮긴 것 같습니다.\n" "ORIG_HEAD로 되돌리지 않습니다." -#: builtin/am.c:2192 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "--patch-format 옵션에 대해 잘못된 값: %s" -#: builtin/am.c:2225 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<옵션>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2226 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<옵션>] (--continue | --skip | --abort)" -#: builtin/am.c:2232 +#: builtin/am.c:2240 msgid "run interactively" msgstr "대화형으로 실행합니다" -#: builtin/am.c:2234 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "아무 동작도 하지 않습니다 (과거부터 있었던 옵션)" -#: builtin/am.c:2236 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다" -#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:172 msgid "be quiet" msgstr "간략히 표시합니다" -#: builtin/am.c:2239 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "커밋 메시지에 Signed-off-by 줄을 남깁니다" -#: builtin/am.c:2242 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "UTF-8 인코딩으로 변환합니다 (기본값)" -#: builtin/am.c:2244 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "git-mailinfo에 -k 옵션을 씁니다" -#: builtin/am.c:2246 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "git-mailinfo에 -b 옵션을 씁니다" -#: builtin/am.c:2248 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "git-mailinfo에 -m 옵션을 씁니다" -#: builtin/am.c:2250 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "mbox 형식에 대해 git-mailsplit에 --keep-cr 옵션을 사용합니다" -#: builtin/am.c:2253 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "am.keepcr에 무관하게 git-mailsplit에 --keep-cr 옵션을 사용하지 않습니다." -#: builtin/am.c:2256 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "절취선 앞의 모든 사항을 무시합니다" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "동작" - -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/am.c:2285 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 msgid "pass it through git-apply" msgstr "git-apply에 넘깁니다" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "최상위" - -#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 -#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 -#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 -#: builtin/submodule--helper.c:826 -msgid "path" -msgstr "경로" - -#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193 -#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 -#: parse-options.h:134 parse-options.h:244 +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 +#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2278 builtin/apply.c:4805 -msgid "num" -msgstr "개수" - -#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "형식" -#: builtin/am.c:2282 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "패치의 형식" -#: builtin/am.c:2288 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "패치 실패가 발생했을 때 오류 메시지 대신 사용합니다" -#: builtin/am.c:2290 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "충돌을 해결한 다음 패치 적용을 계속합니다" -#: builtin/am.c:2293 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "--continue 옵션과 동일" -#: builtin/am.c:2296 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "현재 패치 건너뛰기" -#: builtin/am.c:2299 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "원래 브랜치를 복구하고 패치 적용 작업을 중지합니다." # NOTE: 옵션의 의미는 이게 맞다. 원문에서는 사용자가 # --committer-date-is-author-date라는 옵션을 보고 의미를 알 수 있다고 가정하고 있다. -#: 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 "키-ID" -#: builtin/am.c:2308 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "GPG 서명 커밋" -#: builtin/am.c:2311 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(git-rebase를 위한 내부 용도)" -#: builtin/am.c:2326 +#: builtin/am.c:2334 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -3527,16 +4460,16 @@ msgstr "" "-b/--binary 옵션은 오랜 시간 동안 아무 동작도 하지 않았으므로, 이\n" "옵션은 제거될 예정입니다. 이제 사용하지 마십시오." -#: builtin/am.c:2333 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "인덱스 읽기에 실패했습니다" -#: builtin/am.c:2348 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "이전 리베이스 디렉터리 %s이(가) 아직 있고 mbox를 지정했습니다." -#: builtin/am.c:2372 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3545,486 +4478,14 @@ msgstr "" "벗어난 %s 디렉터리가 발견되었습니다.\n" "제거하려면 \"git am --abort\"를 사용하십시오." -#: builtin/am.c:2378 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "해소 작업이 진행 중입니다. 다시 시작하지 않습니다." -#: builtin/apply.c:122 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<옵션>] [<패치>...]" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "알 수 없는 공백 옵션 '%s'" - -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "알 수 없는 공백 무시 옵션 '%s'" - -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "타임스탬프 정규식을 준비할 수 없습니다 (%s)" - -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s" - -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다" - -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply: 잘못된 git-diff - %2$d번 줄에서 /dev/null을 기대했지만, '%1$s'이" -"(가) 왔습니다" - -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply: 잘못된 git-diff - %d번 줄에 새 파일 이름이 올바르지 않습니다" - -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" -"git apply: 잘못된 git-diff - %d번 줄에 예전 파일 이름이 올바르지 않습니다" - -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: 잘못된 git-diff - %d번 줄에서 /dev/null을 기대했습니다" - -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: 예상치 못한 줄: %.*s" - -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s" - -#: builtin/apply.c:1567 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -"경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니" -"다. (%d번 줄)" - -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "새 파일이 예전 내용에 의존합니다" - -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "삭제한 파일에 아직 내용이 들어 있습니다" - -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" -msgstr "패치가 %d번 줄에서 망가졌습니다" - -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "새 파일 %s이(가) 예전 내용에 의존합니다" - -#: builtin/apply.c:1812 -#, c-format -msgid "deleted file %s still has contents" -msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다" - -#: builtin/apply.c:1815 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다" - -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s" - -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다" - -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "%d번 줄에 쓰레기 데이터만 있는 패치" - -#: builtin/apply.c:2244 -#, c-format -msgid "unable to read symlink %s" -msgstr "%s 심볼릭 링크를 읽을 수 없습니다" - -#: builtin/apply.c:2248 -#, c-format -msgid "unable to open or read %s" -msgstr "%s을(를) 열거나 읽을 수 없습니다" - -#: builtin/apply.c:2901 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "줄 시작이 잘못됨: '%c'" - -#: builtin/apply.c:3020 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "패치 %d번 부분 %d번 줄에서 성공 (오프셋 %d줄)" - -#: builtin/apply.c:3032 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)" - -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"다음을 검색하던 중:\n" -"%.*s" - -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다" - -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다" - -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실" -"제 %s)" - -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "패치 실패: %s:%ld" - -#: builtin/apply.c:3314 -#, c-format -msgid "cannot checkout %s" -msgstr "%s을(를) 가져올 수 없습니다" - -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기" - -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다" - -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: 인덱스에 없습니다" - -#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 -#, c-format -msgid "%s: %s" -msgstr "%s: %s" - -#: builtin/apply.c:3491 builtin/apply.c:3652 -#, c-format -msgid "%s: does not match index" -msgstr "%s: 인덱스와 맞지 않습니다" - -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "제거하는 패치 다음에 파일 내용이 남았습니다" - -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s: 잘못된 종류" - -#: builtin/apply.c:3671 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다" - -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" -msgstr "잘못된 경로 '%s'" - -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: 이미 인덱스에 있습니다" - -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: 이미 작업 디렉터리에 있습니다" - -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다" - -#: builtin/apply.c:3907 -#, 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)와 다릅니다" - -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다" - -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: 패치를 적용하지 않습니다" - -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "%s 패치를 확인하는 중입니다..." - -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "경로 '%s'에 대해 make_cache_entry 실패" - -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "인덱스에서 %s을(를) 제거할 수 없습니다" - -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "하위 모듈 %s에 대해 손상된 패치" - -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다" - -#: builtin/apply.c:4224 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "새로 만든 파일 '%s'에 대해 예비 저장소를 만들 수 없습니다" - -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다" - -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "'%s' 파일을 닫는 중입니다" - -#: builtin/apply.c:4313 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)" - -#: builtin/apply.c:4403 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "%s 패치 깔끔하게 적용." - -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "내부 오류" - -#: builtin/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "%%s 패치를 (%d개 거부) 적용..." - -#: builtin/apply.c:4424 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름" - -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "%s을(를) 열 수 없습니다: %s" - -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "패치 부위 #%d 깔끔하게 적용." - -#: builtin/apply.c:4448 -#, c-format -msgid "Rejected hunk #%d." -msgstr "패치 부위 #%d 거부됨." - -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." -msgstr "패치 '%s' 건너뜀." - -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "인식할 수 없는 입력" - -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "인덱스 파일을 읽을 수 없습니다" - -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "저장소 밖에서 --3way 옵션 사용" - -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "저장소 밖에서 --index 옵션 사용" - -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "저장소 밖에서 --cached 옵션 사용" - -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "'%s' 패치를 열 수 없습니다" - -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "공백 오류 %d개를 넘어갑니다" - -#: 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줄에서 공백 오류를 추가합니다." - -#: 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 "전통적인 diff 경로 앞의 <개수>개의 앞 슬래시(/)를 제거합니다" - -#: 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 "패치를 적용하는 대신, 입력에 대한 diffstat을 출력합니다" - -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "십진수로 추가 및 삭제한 줄 수를 표시합니다" - -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "패치를 적용하는 대신, 입력에 대한 요약을 출력합니다" - -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "패치를 적용하는 대신, 패치를 적용 가능한지 확인합니다" - -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "현재 인덱스에서 패치가 적용 가능한지 확인합니다" - -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "작업 폴더를 바꾸지 않고 패치를 적용합니다" - -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "작업 영역 밖의 파일을 바꾸는 패치를 허용합니다" - -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "그리고 패치도 적용합니다 (--stat/--summary/--check 옵션과 같이 사용)" - -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "패치를 적용하지 않으면 3-방향 병합을 시도합니다" - -#: 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 "경로를 NUL 문자로 구분합니다" - -#: builtin/apply.c:4836 -msgid "ensure at least <n> lines of context match" -msgstr "최소한 <n>줄이 컨텍스트와 일치하는지 확인합니다" - -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "공백 오류가 있는 추가됐거나 수정된 줄을 찾습니다" - -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "컨텍스트를 찾을 때 공백 변경 사항을 무시합니다" - -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "패치를 반대 순서로 적용합니다" - -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "최소한의 컨텍스트 한 줄도 없이 적용합니다" - -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "거부된 패치 부분을 대응되는 *.rej 파일에 남겨둡니다" - -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "패치 부분이 겹쳐도 허용합니다" - -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "파일 끝에 줄바꿈이 빠졌음을 잘못 검색한 경우에 무시합니다" - -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "패치 부분의 헤더의 줄 수를 신용하지 않습니다" - -#: builtin/apply.c:4862 -msgid "prepend <root> to all filenames" -msgstr "모든 파일 이름에 <최상위>를 앞에 붙입니다" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -4084,112 +4545,161 @@ msgstr "<리비전-옵션>은 git-rev-list(1)에 설명되어 있습니다" msgid "Blaming lines" msgstr "블레임 줄" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "블레임 항목을 찾자마자 점진적으로 표시합니다" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "가장자리 커밋에 대해 빈 SHA-1을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "최상위 커밋을 가장자리 커밋으로 취급하지 않습니다 (기본값: 꺼짐)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "작업 비용 통계를 표시합니다" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "강제로 진행 상황을 표시합니다" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "블레임 항목에 대해 출력 점수를 표시합니다" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "원래 파일 이름 표시 (기본값: 자동)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "원래 줄 번호 표시 (기본값: 하지 않음)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "컴퓨터 처리용으로 설계된 형식으로 표시합니다" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "줄마다 커밋 정보가 표시되는 사용자용 형식으로 표시합니다" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "git-annotate와 동일한 형식을 사용합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "내부 형식으로 시각을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "길게 커밋 SHA1을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "작성자 이름과 시각을 표시하지 않습니다 (기본값: 꺼짐)" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "작성자 이름 대신에 전자메일을 표시합니다 (기본값: 꺼짐)" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "공백 문자 차이점을 무시합니다" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "diff를 향상하는데 실험적인 들여쓰기 기반 휴리스틱을 사용합니다." + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "diff를 향상하는데 실험적인 빈 줄 기반 휴리스틱을 사용합니다." + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "더 일치하는 항목을 찾는데 더 시간을 소모합니다" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "git-rev-list를 호출하는 대신 <파일>에서 리비전을 사용합니다" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "<파일>의 내용을 최종 이미지로 사용합니다" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "점수" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "파일 내부와 파일 사이의 복사된 줄을 찾습니다" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "파일 내부와 파일 사이의 옮겨진 줄을 찾습니다" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "Process only line range n,m, counting from 1" msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "4년 11달 전" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents 및 --reverse 옵션은 호환되지 않습니다." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "--contents 옵션을 마지막 오브젝트 이름에 사용할 수 없습니다" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니" +"다" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "%s 경로가 %s 안에 없습니다" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "%s 경로에 대해 %s 블롭을 읽을 수 없음" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "%s 파일에는 줄이 %lu개 뿐입니다" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<옵션>] [-r | -a] [--merged | --no-merged]" @@ -4438,6 +4948,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 "여러 색으로 출력합니다" @@ -4510,8 +5024,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 "오브젝트" @@ -4524,7 +5038,7 @@ msgstr "해당 오브젝트의 브랜치만 표시합니다" msgid "Failed to resolve HEAD as a valid ref." msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다." -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "레퍼런스/헤드 아래에 HEAD가 없습니다!" @@ -4636,64 +5150,80 @@ 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 "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<종류" -">|--textconv) <오브젝트>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>" -#: builtin/cat-file.c:444 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:551 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<종류>는 다음 중 하나가 될 수 있습니다: blob, tree, commit, tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "오브젝트 종류를 봅니다" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "오브젝트 크기를 봅니다" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "오류가 없을 때 0을 리턴하고 끝냅니다" -#: 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 "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 textconv를 실행합니다" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 필터를 실행합니다" + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "블롭" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "--textconv/--filters 옵션에 경로를 지정합니다" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s 및 -t 옵션이 손상된 오브젝트에 대해 동작하도록 허용합니다" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "--batch 출력에 대해 버퍼링합니다" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "표준 입력에서 입력된 오브젝트의 정보와 내용을 표시합니다" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "표준 입력에서 입력된 오브젝트의 정보를 표시합니다" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "트리 내부의 심볼릭 링크를 따라갑니다 (--batch 또는 --batch-check와 같이 사용)" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "--batch 또는 --batch-check에서 모든 오브젝트를 표시합니다" @@ -4713,7 +5243,7 @@ msgstr "파일에 설정된 모든 속성을 표시합니다" msgid "use .gitattributes only from the index" msgstr "인덱스에서만 .gitattributes를 사용합니다" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "표준 입력에서 파일 이름을 읽습니다" @@ -4811,9 +5341,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 "문자열" @@ -4884,11 +5414,11 @@ msgstr "경로를 업데이트하고 '%s' 브랜치로 전환하는 일은 동 msgid "path '%s' is unmerged" msgstr "'%s' 경로를 병합하지 않았습니다" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "현재 인덱스를 먼저 해결해야 합니다" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n" @@ -4897,7 +5427,7 @@ msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n" msgid "HEAD is now at" msgstr "HEAD의 현재 위치는" -#: builtin/checkout.c:667 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "HEAD를 업데이트할 수 없습니다" @@ -5017,7 +5547,7 @@ msgstr "'%s' 옵션은 '%s' 옵션과 같이 쓸 수 없습니다" msgid "Cannot switch branch to a non-commit '%s'" msgstr "브랜치를 커밋이 아닌 '%s'(으)로 전환할 수 없습니다" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 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" @@ -5071,7 +5601,7 @@ msgstr "새 브랜치에 대해 3-방향 병합을 수행합니다" msgid "update ignored files (default)" msgstr "무시하는 파일을 업데이트합니다 (기본값)" -#: builtin/checkout.c:1154 builtin/log.c:1459 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "스타일" @@ -5092,8 +5622,8 @@ msgstr "'git checkout <없는-브랜치>'에 대해 추측합니다" msgid "do not check if another worktree is holding the given ref" msgstr "다른 작업폴더에 주어진 레퍼런스가 있는지 확인하지 않습니다" -#: builtin/checkout.c:1163 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 "강제로 진행 상황을 표시합니다" @@ -5279,8 +5809,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 "패턴" @@ -5320,112 +5850,130 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]" -#: 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 "복제할 경우에만 --reference를 사용합니다" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "이름" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "업스트림 추적에 'origin' 대신 <이름>을 사용합니다" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "리모트의 git-upload-pack 경로" -#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/pull.c:202 msgid "depth" msgstr "깊이" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "지정한 깊이의 얕은 복제를 만듭니다" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "시각" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "지정한 시간 이후의 얕은 복제를 만듭니다" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "리비전" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "레퍼런스를 제외해 얕은 복제의 커밋 내역을 깊게 만듭니다" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "하나의 브랜치만 복제합니다 (HEAD 또는 --branch로 지정)" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "모든 복제한 하위 모듈은 얕은 모듈입니다" -#: builtin/clone.c:98 builtin/init-db.c:482 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "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 "깃 디렉터리를 작업 폴더와 별개의 위치에 놓습니다" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "키=값" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "새 저장소 안에서 설정합니다" -#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "IPv4 주소만 사용합니다" -#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "IPv6 주소만 사용합니다" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5433,58 +5981,42 @@ msgstr "" "디렉터리 이름을 알아낼 수 없습니다.\n" "명령행에서 디렉터리를 지정하십시오" -#: builtin/clone.c:307 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다." - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다." - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다" - -#: builtin/clone.c:317 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' is grafted" -msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "정보: '%s'에 대한 보조 파일을 추가할 수 없습니다: %s\n" -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "'%s'을(를) 여는데 실패" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "'%s'이(가) 있지만 디렉터리가 아닙니다" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "'%s'에 대해 stat()이 실패했습니다\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "'%s' 링크를 만드는데 실패했습니다" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "파일을 '%s'(으)로 복사하는데 실패했습니다" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "완료.\n" -#: builtin/clone.c:461 +#: builtin/clone.c:460 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5494,122 +6026,142 @@ msgstr "" "'git status' 명령으로 무엇을 체크아웃했는지 살펴볼 수 있고\n" "'git checkout -f HEAD'로 체크아웃을 다시 할 수 있습니다\n" -#: builtin/clone.c:538 +#: builtin/clone.c:537 #, c-format msgid "Could not find remote branch %s to clone." msgstr "복제할 리모트의 %s 브랜치를 찾을 수 없습니다." -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "리모트에서 필요한 오브젝트를 모두 보내지 않았습니다" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "%s을(를) 업데이트할 수 없습니다" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "리모트 HEAD가 없는 레퍼런스를 참고하므로, 체크아웃할 수 없습니다.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "작업 폴더를 체크아웃할 수 없습니다" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "파라미터를 설정 파일에 쓸 수 없습니다" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "정리용으로 repack할 수 없습니다" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "보조 임시 파일을 삭제할 수 없습니다" -#: builtin/clone.c:863 builtin/receive-pack.c:1857 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "너무 인자가 많습니다." -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "복제할 저장소를 지정해야 합니다." -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 및 --origin %s 옵션은 호환되지 않습니다." -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 및 --separate-git-dir 옵션은 호환되지 않습니다." -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "'%s' 저장소가 없습니다" -#: builtin/clone.c:900 builtin/fetch.c:1293 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "깊이가(%s) 0보다 큰 수가 아닙니다" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "대상 경로가('%s') 이미 있고 빈 디렉터리가 아닙니다." -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "작업 폴더가('%s') 이미 있습니다." -#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 #: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "'%s'의 앞 디렉터리를 만들 수 없습니다" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "작업 디렉터리를('%s') 만들 수 없습니다" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "간략한 저장소로('%s') 복제합니다...\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "'%s'에 복제합니다...\n" -#: builtin/clone.c:997 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 " +"것과 호환되지 않습니다" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오." -#: builtin/clone.c:1000 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십" +"시오." + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하" +"십시오." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "원본 저장소가 얕은 저장소이므로, --local 옵션을 무시합니다" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local 옵션은 무시됩니다" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "%s의 복제 방법을 알지 못합니다" -#: builtin/clone.c:1058 builtin/clone.c:1066 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "리모트의 %s 브랜치가 업스트림 %s에 없습니다" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "빈 저장소를 복제한 것처럼 보입니다." @@ -5749,66 +6301,66 @@ msgstr "" "그 다음에 \"git cherry-pick --continue\"를 하면 나머지 커밋에\n" "대해 커밋 빼오기를 다시 시작합니다.\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "HEAD 트리 오브젝트의 묶음을 푸는데 실패했습니다" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "임시 인덱스를 만들 수 없습니다" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "대화형 추가가 실패했습니다" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "임시 인덱스를 업데이트할 수 없습니다" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "주요 캐시 트리를 업데이트하는데 실패했습니다" -#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "new_index 파일에 쓸 수 없습니다" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "병합하는 중 부분 커밋을 할 수 없습니다." -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "커밋 빼오기를 하는 중 부분 커밋을 할 수 없습니다." -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "인덱스를 읽을 수 없습니다" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "임시 인덱스 파일을 쓸 수 없습니다" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "'%s' 커밋에 작성자 헤더가 없습니다" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "'%s' 커밋의 작성자 헤더 형식이 잘못되었습니다" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "--author 파라미터 형식이 잘못되었습니다" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "시각 형식이 잘못되었습니다: %s" -#: builtin/commit.c:656 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5816,38 +6368,38 @@ msgstr "" "현재 커밋 메시지에서 사용되지 않는 주석 문자를\n" "선택할 수 없습니다" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "%s 커밋을 찾아볼 수 없습니다" -#: builtin/commit.c:705 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "(표준 입력에서 로그 메시지를 읽음)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "표준 입력에서 로그 메시지를 읽을 수 없습니다" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "'%s' 로그 파일을 읽을 수 없습니다" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "SQUASH_MSG를 읽을 수 없습니다" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "MERGE_MSG를 읽을 수 없습니다" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "커밋 서식을 쓸 수 없습니다" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5862,7 +6414,7 @@ msgstr "" "\t%s\n" "다시 시도하십시오.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5877,7 +6429,7 @@ msgstr "" "\t%s\n" "다시 시도하십시오.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5886,7 +6438,7 @@ msgstr "" "변경 사항에 대한 커밋 메시지를 입력하십시오. '%c' 문자로 시작하는\n" "줄은 무시되고, 메시지를 입력하지 않으면 커밋이 중지됩니다.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5897,149 +6449,153 @@ msgstr "" "줄은 보존되니, 필요하면 직접 제거하십시오. 메시지를 입력하지\n" "않으면 커밋이 중지됩니다.\n" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s작성자: %.*s <%.*s>" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%s시각: %s" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s커미터: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "인덱스를 읽을 수 없습니다" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "트리를 만드는데 오류" -#: builtin/commit.c:965 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "메시지를 -m 또는 -F 옵션으로 입력하십시오.\n" -#: builtin/commit.c:1067 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' 옵션이 '이름 <전자메일>' 형식이 아니고 기존 작성자에도 없습니다" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "추적되지 않는 파일 모드가 ('%s') 잘못되었습니다" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long 및 -z 옵션은 호환되지 않습니다" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "--reset-author 및 --author 옵션을 모두 사용하면 앞뒤가 맞지 않습니다" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "바꿀 사항이 없습니다." -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "병합 중에 있습니다 -- 커밋을 바꿀 수 없습니다." -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "커밋 빼오기 중에 있습니다 -- 커밋을 바꿀 수 없습니다." -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash 및 --fixup 옵션은 같이 쓸 수 없습니다" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup 옵션 중에 하나만 사용할 수 있습니다." -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "-m 옵션은 -c/-C/-F/--fixup 옵션과 같이 쓸 수 없습니다." -#: builtin/commit.c:1186 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 옵션은 -C, -c 또는 --amend 옵션과 같이 써야 합니다." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니" "다." -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "경로가 없이 --include/--only 옵션을 쓰면 앞뒤가 맞지 않습니다." -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "기발하네요... 마지막을 변경된 인덱스로 바꿉니다." -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "-i 또는 -o 없이 명시적인 경로를 지정했습니다. --only 경로를 가정합니다..." -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "잘못된 정리 모드 %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "-a 옵션과 경로를 같이 사용하면 앞뒤가 맞지 않습니다." -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "상태를 간략하게 표시합니다" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "브랜치 정보를 표시합니다" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "버전" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "컴퓨터가 읽을 수 있는 형식" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "긴 형식으로 상태를 표시합니다 (기본값)" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "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 "모드" -#: builtin/commit.c:1349 builtin/commit.c:1634 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "추적되지 않는 파일을 표시합니다. 추가 옵션: all, normal, no (기본값: all)" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "무시되는 파일을 표시합니다" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "언제" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6047,198 +6603,198 @@ msgstr "" "하위 모듈의 변경을 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: " "all)" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "추적되지 않는 파일의 목록을 여러 열로 표시합니다" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "새로 만든 커밋을 찾아볼 수 없습니다" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "새로 만든 커밋을 파싱할 수 없습니다" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "HEAD 분리됨" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (최상위-커밋)" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "성공적인 커밋 후에 요약을 표시하지 않습니다" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "커밋 메시지 서식에 diff를 표시합니다" -#: 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 "지정한 커밋을 수정하는데 autosquash 형식 메시지를 사용합니다" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "지정한 커밋을 합치는데 autosquash 형식 메시지를 사용합니다" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "커밋을 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같이 사용)" -#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Signed-off-by: 줄을 추가합니다" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "지정한 서식 파일을 사용합니다" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "커밋 편집을 강제합니다" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "기본값" -#: builtin/commit.c:1608 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "메시지에서 공백과 #주석을 지웁니다" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "커밋 메시지 서식에 상태를 포함합니다" -#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 서명 커밋" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "커밋 내용 옵션" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "변경된 파일을 모두 커밋합니다" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "지정한 파일을 커밋할 인덱스에 추가합니다" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "대화형으로 파일을 추가합니다" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "대화형으로 변경 사항을 추가합니다" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "지정한 파일만 커밋합니다" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "커밋 전 후크와 커밋 메시지 후크를 건너뜁니다" -#: 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 "HEAD 커밋을 파싱할 수 없습니다" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "손상된 MERGE_HEAD 파일 (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE를 읽을 수 없습니다" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "커밋 메시지를 읽을 수 없습니다: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "커밋을 중지합니다. 커밋 메시지가 비어 있습니다.\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1802 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -6404,11 +6960,21 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "%s 설정 파일을 만들 수 없습니다" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"여러 개의 값을 하나의 값으로 덮어쓸 수 없습니다.\n" +"%s을(를) 변경하려면 정규식을 쓰거나, --add 또는 --replace-all 옵션을\n" +"사용하십시오." + +#: 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 "사람이 읽기 좋은 형식으로 크기를 표시합니다" @@ -6528,7 +7094,7 @@ msgstr "<n>개의 가장 최근의 태그만 고려합니다 (기본값: 10)" 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 "대안으로 요약한 커밋 오브젝트를 표시합니다" @@ -6562,21 +7128,21 @@ msgstr "'%s': 일반 파일이나 심볼릭 링크가 아닙니다" msgid "invalid option: %s" msgstr "잘못된 옵션: %s" -#: 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 "잘못된 '%s' 오브젝트가 주어졌습니다." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "두 개보다 많은 블롭이 주어졌습니다: '%s'" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "처리하지 않은 '%s' 오브젝트가 주어졌습니다." @@ -6649,161 +7215,165 @@ msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<옵션>]" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "모든 리모트에서 가져옵니다" -#: builtin/fetch.c:95 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "덮어쓰지 말고 .git/FETCH_HEAD에 덧붙입니다" -#: builtin/fetch.c:97 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "리모트 쪽에 묶음을 업로드할 경로" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "로컬 브랜치를 강제로 덮어씁니다" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "여러 리모트에서 가져옵니다" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "모든 태그와 관련 오브젝트를 가져옵니다" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "모든 태그를 가져오지 않습니다 (--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "병렬적으로 받아오는 하위모듈 개수" -#: builtin/fetch.c:108 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 msgid "prune remote-tracking branches no longer on remote" msgstr "리모트에 이제 없는 리모트 추적 브랜치를 잘라냅니다" -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "주문형" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "하위 모듈 재귀적으로 가져오기 방식을 설정합니다" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "다운로드한 묶음을 보존합니다" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "HEAD 레퍼런스 업데이트를 허용합니다" -#: builtin/fetch.c:119 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "얕은 복제의 커밋 내역을 깊게 만듭니다" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "얕은 복제의 커밋 내역을 시간을 기준으로 깊게 만듭니다" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "완전한 저장소로 전환합니다" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "디렉터리" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "하위 모듈 경로 출력의 앞에 이 디렉터리를 붙입니다" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "재귀 기본 모드" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr ".git/shallow를 업데이트하는 레퍼런스를 허용합니다" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "레퍼런스맵" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "레퍼런스맵 가져오기를 지정합니다" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "리모트 레퍼런스 HEAD를 찾을 수 없습니다" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "fetch.output 설정에 잘못된 값이 있습니다: %s" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "%s 오브젝트가 없습니다" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[최신 상태]" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[거부됨]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "현재 브랜치에서 가져올 수 없음" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[태그 업데이트]" -#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 -#: builtin/fetch.c:684 +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "unable to update local ref" msgstr "로컬 레퍼런스를 업데이트할 수 없습니다" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[새로운 태그]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[새로운 브랜치]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[새로운 레퍼런스]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "강제 업데이트" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "정방향 진행이 아님" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s이(가) 모든 필요한 오브젝트를 보내지 않았습니다\n" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "얕은 최상위의 업데이트가 허용되지 않으므로 %s을(를) 거부합니다" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "%.*s URL에서\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6812,55 +7382,55 @@ msgstr "" "업데이트할 수 없는 로컬 레퍼런스가 있습니다. 과거 충돌 브랜치를\n" " 제거하려면 'git remote prune %s' 명령을 실행해 보십시오" -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s 레퍼런스가 연결이 끊어지게 됩니다)" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s 레퍼런스가 연결이 끊어졌습니다)" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[삭제됨]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(없음)" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "간략한 저장소가 아닌 저장소의 현재 %s 브랜치로 가져오기를 거절합니다" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "\"%s\" 옵션의 \"%s\" 값은 %s에 대해 올바르지 않습니다" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "\"%s\" 옵션은 '%s'에 대해 무시됩니다\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "'%s'에서 가져오는 방법을 알 수 없습니다" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "%s을(를) 가져오는 중\n" -#: builtin/fetch.c:1201 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "%s을(를) 가져올 수 없습니다" -#: builtin/fetch.c:1219 +#: builtin/fetch.c:1257 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6868,33 +7438,41 @@ msgstr "" "리모트 저장소를 지정하지 않았습니다. 새 리비전을 가져올 수 있는\n" "URL이나 리모트 이름을 지정하십시오." -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "태그 이름을 지정해야 합니다." -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "--deepen 옵션에 음수 깊이는 지원하지 않습니다" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 및 --unshallow 옵션은 같이 쓸 수 없습니다" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "" "완전한 저장소에 대해 --unshallow 옵션을 사용하는 건 앞뒤가 맞지 않습니다" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 명령에 저장소 인자가 없습니다" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 명령은 레퍼런스명세 인자와 같이 쓰면 앞뒤가 맞지 않습니다" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "그런 리모트나 리모트 그룹이 없습니다: %s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "그룹을 가져오고 레퍼런스명세를 지정하면 앞뒤가 맞지 않습니다" @@ -6904,23 +7482,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파일>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "shortlog에서 최대 <n>개 로그를 표시합니다" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "--log와 동일 (없어질 예정)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "텍스트" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "<텍스트>를 시작 메시지로 사용합니다" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "읽어들일 파일" @@ -7036,7 +7614,7 @@ msgstr "진행 상황을 표시합니다" msgid "show verbose names for reachable objects" msgstr "접근할 수 없는 오브젝트의 이름을 자세히 표시합니다" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "오브젝트를 확인합니다" @@ -7128,225 +7706,220 @@ msgstr "grep: 스레드를 만드는데 실패했습니다: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "잘못된 스레드 수를 %2$s에 대해 지정했습니다 (%1$d)" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "트리를 읽을 수 없습니다 (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "종류가 %s인 오브젝트에서 grep을 할 수 없습니다" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "`%c' 옵션에는 숫자 값이 와야 합니다" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "'%s'을(를) 열 수 없습니다" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "작업 폴더 대신에 인덱스에서 검색합니다" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "깃으로 관리하지 않은 내용에서 찾습니다" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "추적되는 파일과 추적되지 않는 파일 모두에서 검색합니다" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'로 지정한 파일을 무시합니다" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "일치하지 않는 줄을 표시합니다" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "대소문자 구별하지 않고 맞춥니다" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "단어 경계 부분에 대해서만 패턴을 맞춥니다" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "바이너리 파일을 텍스트로 처리합니다" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "바이너리 파일에서 패턴을 맞추지 않습니다" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "textconv 필터를 사용해 바이너리 파일을 처리합니다" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "최대 <깊이> 단계만큼 내려갑니다" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "POSIX 확장 정규식을 사용합니다" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "기본 POSIX 정규식을 사용합니다 (기본값)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "패턴을 고정 문자열로 해석합니다" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "펄과 호환되는 정규식을 사용합니다" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "줄 번호를 표시합니다" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "파일 이름을 표시하지 않습니다" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "파일 이름을 표시합니다" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "파일 이름을 최상위 디렉터리 상대 경로로 표시합니다" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "일치하는 줄을 표시하지 않고 파일 이름만 표시합니다" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "--files-with-matches 옵션과 동일" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "일치하지 않는 파일의 이름만 표시합니다" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "파일 이름 다음에 NUL을 출력합니다" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "일치하는 줄을 표시하지 않고 일치하는 수를 표시합니다" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "일치하는 부분을 강조합니다" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "다른 파일 사이에 일치하는 부분의 사이에 빈 줄을 출력합니다" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "같은 파일에서 여러 개가 일치하면 파일 이름을 한 번만 표시합니다" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "일치하는 부분 앞뒤에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "일치하는 부분 앞에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "일치하는 부분 뒤에 컨텍스트를 <n>줄 표시합니다" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "<n>개의 작업 스레드를 사용합니다" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "-C NUM 옵션의 줄임" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "일치 항목 앞에 함수 이름 줄을 표시합니다" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "들어 있는 함수를 표시합니다" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "파일에서 패턴을 읽습니다" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "<패턴>과 일치" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "-e 옵션으로 지정한 패턴을 결합합니다" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "출력하지 않고 일치하는 항목을 exit() 상태 번호로 리턴합니다" -#: 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 "grep 표현식에 대한 파싱 트리를 표시합니다" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "페이저" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "일치하는 파일을 페이저 프로그램에서 표시합니다" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1) 실행을 허용합니다 (이 빌드에서는 무시)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "패턴을 지정하지 않았습니다." -#: builtin/grep.c:845 builtin/index-pack.c:1479 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "잘못된 스레드 수를 지정했습니다 (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 옵션은 작업 폴더에서만 동작합니다" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached 또는 --untracked 옵션은 --no-index 옵션과 같이 쓸 수 없습니다." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 또는 --untracked 옵션은 리비전과 같이 쓸 수 없습니다." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 옵션은 추적되는 내용에 대해 쓸 수 없습니다." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "--cached 옵션과 트리를 모두 지정했습니다." @@ -7362,83 +7935,87 @@ 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 "종류" -#: 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 "git help [--all] [--guides] [--man | --web | --info] [<명령>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "'%s' 도움말 포맷을 인식할 수 없습니다" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "emacsclient 시작에 실패했습니다." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "emacsclient 버전 파싱에 실패했습니다." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient '%d' 버전은 너무 과거 (< 22) 버전입니다." -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "실행 실패: '%s'" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7447,7 +8024,7 @@ msgstr "" "'%s': 지원하지 않는 맨 페이지 보기 프로그램 경로.\n" "대신에 'man.<도구>.cmd' 옵션을 사용해 보십시오." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7456,295 +8033,299 @@ msgstr "" "'%s': 지원하지 않는 맨 페이지 보기 프로그램 명령.\n" "대신에 'man.<도구>.path' 옵션을 사용해 보십시오." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': 알 수 없는 맨 페이지 보기 프로그램." -#: 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:408 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "경로마다 속성 정의하기" -#: builtin/help.c:409 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "매일매일 사용하는 20개 내외의 깃 명령" -#: builtin/help.c:410 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "깃 용어 사전" -#: builtin/help.c:411 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "의도적으로 추적하지 않는 파일을 무시하게 지정하기" -#: builtin/help.c:412 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "하위 모듈 속성 정의하기" -#: builtin/help.c:413 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "깃의 리비전 및 범위를 지정하기" -#: builtin/help.c:414 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "깃 따라하기 안내서 (버전 1.5.1 이후)" -#: builtin/help.c:415 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "추천하는 깃 활용 작업 순서의 개요" -#: builtin/help.c:427 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "자주 사용하는 깃 안내서는 다음과 같습니다:\n" -#: builtin/help.c:448 builtin/help.c:465 -#, c-format -msgid "usage: %s%s" -msgstr "사용법: %s%s" - -#: builtin/help.c:481 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 명령은 `%s' 명령의 단축입니다" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "사용법: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "%s을(를) 열 수 없습니다" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "오브젝트 종류가 맞지 않습니다 (%s)" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "예상한 %s 오브젝트를 받지 않았습니다" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "%s 오브젝트: 예상한 종류 %s, 실제 %s" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "%d 바이트를 채울 수 없습니다" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "너무 빨리 파일이 끝남" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "입력에 읽기 오류" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "있는 바이트보다 더 많이 사용합니다" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "현재 정의된 off_t에 비해 묶음이 너무 큽니다" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "묶음 크기가 최대 허용 크기를 넘었습니다" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "'%s'을(를) 만들 수 없습니다" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "'%s' 묶음 파일을 열 수 없습니다" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "묶음 서명이 맞지 않습니다" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "묶음의 %<PRIu32> 버전을 지원하지 않습니다" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "묶음의 %<PRIuMAX> 오프셋에 잘못된 오브젝트가 있습니다: %s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "inflate가 %d번을 리턴했습니다" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "델타 베이스 오브젝트에 대해 오프셋 값이 오버플로우" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "델타 베이스 오프셋이 범위를 벗어났습니다" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "알 수 없는 오브젝트 종류 %d번" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "묶음 파일에 대해 pread를 할 수 없습니다" -#: builtin/index-pack.c:573 +#: builtin/index-pack.c:576 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "묶음 파일이 너무 일찍 끝남. %<PRIuMAX> 바이트 부족" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "심각한 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 "SHA1 충돌이 %s에서 발견되었습니다!" -#: builtin/index-pack.c:748 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "기존 %s 오브젝트를 읽을 수 없습니다" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "잘못된 블롭 오브젝트 %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "잘못된 %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "오브젝트에 오류" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s의 모든 하위 오브젝트에 접근할 수 없습니다" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "델타를 적용하는데 실패했습니다" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "오브젝트를 받는 중" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "오브젝트 인덱스를 만드는 중" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "묶음이 손상되었습니다 (SHA1 일치하지 않음)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "묶음 파일에 대해 fstat()할 수 없습니다" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "묶음의 끝에 쓰레기 데이터가 있습니다" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects()에서 극심한 혼란" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "델타를 알아내는 중" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "스레드를 만들 수 없습니다: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "극심한 혼란" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1256 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "로컬 오브젝트 %d개 마침" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%s에 대해 예상치 못한 테일 체크섬 (디스크 손상?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "묶음에 알아내지 못한 델타 %d개가 있습니다" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "추가한 오브젝트를 deflate할 수 없습니다 (%d)" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "%s 로컬 오브젝트가 손상되었습니다" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "묶음 파일을 닫는데 오류" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "'%s' 보존 파일을 쓸 수 없습니다" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "쓴 '%s' 보존 파일을 닫지 못했습니다" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "묶음 파일을 저장할 수 없습니다" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "인덱스 파일을 저장할 수 없습니다" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "잘못된 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "스레드 기능이 없습니다. %s 무시" @@ -7782,95 +8363,95 @@ msgstr "'%s' 묶음파일 이름이 '.pack'으로 끝나지 않습니다" msgid "bad %s" msgstr "잘못된 %s" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 옵션은 --stdin 옵션과 같이 쓸 수 없습니다" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "--verify 옵션에 묶음파일 이름을 지정하지 않았습니다" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "'%s'을(를) stat()할 수 없습니다" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "'%s' 서식을 stat()할 수 없습니다" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "'%s'을(를) opendir()할 수 없습니다" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "'%s'을(를) readlink()할 수 없습니다" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "'%s'을(를) '%s'에 symlink()할 수 없습니다" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "'%s'을(를) '%s'에 복사할 수 없습니다" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "%s 서식을 무시합니다" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "%s에 서식이 없습니다" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "'%s'에서 서식을 복사하지 않습니다: %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s 파일이 이미 있습니다" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "파일 종류 %d번을 처리할 수 없습니다" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "%s을(를) %s(으)로 옮길 수 없습니다" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s 파일이 이미 있습니다" + +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "%s%s 안의 기존 공유 깃 저장소를 다시 초기화했습니다\n" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "%s%s 안의 기존 깃 저장소를 다시 초기화했습니다\n" -#: builtin/init-db.c:407 +#: builtin/init-db.c:408 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "%s%s 안의 빈 공유 깃 저장소를 다시 초기화했습니다\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "%s%s 안의 빈 깃 저장소를 다시 초기화했습니다\n" -#: builtin/init-db.c:455 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7878,25 +8459,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<서식-디렉터리>] [--shared[=<권" "한>]] [<디렉터리>]" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "권한" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "깃 저장소를 다른 사용자가 공유할 수 있게 지정" -#: 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 "%s에 대해 mkdir를 할 수 없습니다" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "%s에 대해 chdir를 할 수 없습니다" -#: 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-" @@ -7905,7 +8486,7 @@ msgstr "" "%s (또는 --work-tree=<디렉터리>) 허용되지 않음. %s (또는 --git-" "dir=<directory>) 지정이 없으면" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "작업 폴더 '%s'에 접근할 수 없습니다" @@ -8016,37 +8597,34 @@ 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 "정신나간 in-reply-to 헤더: %s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<옵션>] [<시작시각> | <리비전-범위>]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "출력 디렉터리가 두개?" -#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "알 수 없는 커밋 %s" -#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 -#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 -#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 -#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다." -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "정확한 병합 기준점을 찾을 수 없습니다." -#: builtin/log.c:1263 +#: builtin/log.c:1267 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -8057,209 +8635,213 @@ msgstr "" "아니면 직접 '--base=<기준점-커밋-ID>' 옵션으로 기준점 커밋을 지정할\n" "수도 있습니다." -#: 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 "패치 ID를 알아낼 수 없습니다" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "하나의 패치에 대해서도 [PATCh n/m]을 붙입니다" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "여러 개 패치에 대해서도 [PATCH]를 붙입니다" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "패치를 표준 출력으로 표시합니다" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "커버레터를 만듭니다" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "출력 파일 이름에 간단한 일련 번호를 사용합니다" -#: builtin/log.c:1416 +#: builtin/log.c:1420 msgid "sfx" msgstr "확장자" -#: builtin/log.c:1417 +#: builtin/log.c:1421 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' 대신 <확장자>를 사용합니다" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "패치 번호를 1 대신 <n>에서 시작합니다" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "시리즈를 N번째 re-roll로 표시합니다" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "[PATCH] 대신 [RFC PATCH]를 사용합니다" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[PATCH] 대신 [<접두어>]를 사용합니다" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "결과 파일을 <디렉터리>에 저장합니다" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "[PATCH]를 자르거나 추가하지 않습니다" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "바이너리 diff를 만들지 않습니다" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "From 헤더에서 모두 0인 해시를 출력합니다" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "업스트림에 있는 패치를 포함하지 않습니다" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "기본값 (패치 + 통계) 대신 패치 형식을 표시합니다" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "메시징" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "헤더" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "전자메일 헤더" -#: builtin/log.c:1443 builtin/log.c:1445 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "전자메일" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "add To: header" msgstr "To: 헤더를 추가합니다" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "Cc: 헤더를 추가합니다" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "ident" msgstr "신원" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "set From address to <ident> (or committer ident if absent)" msgstr "<신원>에서 From 주소를 설정합니다 (없으면 커미터 주소 신원 사용)" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "메시지-ID" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "첫 메일을 <메시지-ID>에 대한 답장 메일로 만듭니다" -#: builtin/log.c:1452 builtin/log.c:1455 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "경계" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "패치를 첨부합니다" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "패치를 본문에 포함합니다" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "메시지에 스레드를 사용, 스타일: shallow, deep" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "서명" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "서명을 추가합니다" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "베이스-커밋" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "전제조건 트리 정보를 패치 시리즈에 추가합니다" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "파일에서 서명을 추가합니다" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "패치 파일 이름을 표시하지 않습니다" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n 및 -k 옵션은 하나만 써야 합니다." -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix 및 -k 옵션은 하나만 써야 합니다." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc 및 -k 옵션은 하나만 써야 합니다." -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only 옵션은 앞뒤가 맞지 않습니다" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status 옵션은 앞뒤가 맞지 않습니다" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check 옵션은 앞뒤가 맞지 않습니다" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "표준 출력이나 디렉터리 중에 하나만 지정해야 합니다." -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "'%s' 디렉터리를 만들 수 없습니다" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' 서명 파일을 읽을 수 없습니다" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "출력 파일을 만드는데 실패했습니다" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -8267,99 +8849,103 @@ msgstr "" "추적되는 리모트 브랜치를 찾을 수 없습니다. <업스트림>을 수동으로 지정하십시" "오.\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<옵션>] [<파일>...]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "파일 상태를 태그와 같이 표시합니다" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "'변경되지 않았다고 가정' 파일에 소문자를 사용합니다" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "출력에 캐시된 파일을 표시합니다 (기본값)" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "출력에 삭제된 파일을 표시합니다" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "출력에 수정된 파일을 표시합니다" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "출력에 기타 파일을 표시합니다" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "출력에 무시된 파일을 표시합니다" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "출력에 커밋 표시된 내용의 오브젝트 이름을 표시합니다" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "파일 시스템에서 제거해야 하는 파일을 표시합니다" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "기타 디렉터리의 이름만 표시합니다" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "파일의 줄 끝을 표시합니다" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "빈 디렉터리 표시하지 않기" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "출력에 병합하지 않은 파일을 표시합니다" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "resolve-undo 정보를 표시합니다" -#: 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 "디버깅 데이터를 표시합니다" @@ -8476,31 +9062,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 "병합이 끝날 때 diffstat을 표시하지 않습니다" -#: 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 "병합이 끝날 때 diffstat을 표시합니다" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(--stat 옵션과 동일)" -#: builtin/merge.c:201 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "병합 커밋의 메시지에 shortlog 항목을 (최대 <n>개) 추가합니다" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "병합하는 대신 하나의 커밋을 만듭니다" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "병합이 성공하면 커밋을 합니다 (기본값)" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "커밋 전에 메시지를 편집합니다" @@ -8508,28 +9094,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 "지정한 커밋에 올바른 GPG 서명이 있는지 검증합니다" -#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "전략" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "사용할 병합 전략" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "옵션=값" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "선택한 병합 전략에 대한 옵션" @@ -8541,7 +9127,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 "관계 없는 커밋 내역의 병합을 허용합니다" @@ -8759,55 +9345,55 @@ msgstr "관계 없는 커밋 내역의 병합을 거부합니다" msgid "Already up-to-date." msgstr "이미 업데이트 상태입니다." -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "업데이트 중 %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "아주 간단한 인덱스 내부 병합을 시도합니다...\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "아님.\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "이미 업데이트 상태입니다. 야호!" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "정방향이 불가능하므로, 중지합니다." -#: builtin/merge.c:1480 builtin/merge.c:1559 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "트리를 본래 위치로 되돌립니다...\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "병합 전략 %s 시도...\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "병합을 처리한 전략이 없습니다.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "전략 %s(으)로 병합이 실패했습니다.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "수동 해결의 준비를 위해 %s 전략을 사용합니다.\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "자동 병합이 잘 진행되었습니다. 요청한대로 커밋 전에 중지합니다\n" @@ -8832,23 +9418,23 @@ msgstr "git merge-base --is-ancestor <커밋> <커밋>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <레퍼런스> [<커밋>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "모든 과거 공통 커밋을 출력합니다" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "하나의 n-방향 병합에 대한 과거 커밋을 찾습니다" -#: 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 "<레퍼런스>의 reflog에서 <커밋>이 분리된 위치를 찾습니다" @@ -8892,6 +9478,36 @@ msgstr "충돌에 대해 경고하지 않습니다" msgid "set labels for file1/orig-file/file2" msgstr "<파일1>/<본래-파일>/<파일2>에 대한 레이블을 설정합니다" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "알 수 없는 옵션: %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "'%s' 오브젝트를 파싱할 수 없습니다" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "베이스를 %d개 보다 많이 쓸 수 없습니다. %s 무시합니다." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "두 개의 헤드 병합 외에는 처리하지 않습니다." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "'%s' 레퍼런스를 알아낼 수 없습니다" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "%s 병합, %s 항목과\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9000,43 +9616,43 @@ msgstr "이름 바꾸기, '%s'에서 '%s'(으)로\n" msgid "renaming '%s' failed" msgstr "'%s'의 이름 바꾸기가 실패했습니다" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<옵션>] <커밋>..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<옵션>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<옵션>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "이름만 표시 (SHA-1 없이)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "커밋을 지정할 때 태그만 사용합니다" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "<패턴>과 일치하는 레퍼런스만 사용합니다" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "모든 레퍼런스에서 접근 가능한 모든 커밋 목록을 표시합니다" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "표준입력에서 읽습니다" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "`정의되지 않은' 이름 표시를 허용합니다 (기본값)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "입력의 태그 레퍼런스를 따라갑니다 (내부 사용)" @@ -9170,7 +9786,7 @@ msgid "failed to finish 'show' for object '%s'" msgstr "오브젝트 '%s'에 대해 'show'를 마치는데 실패했습니다" #: 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 "노트 내용을 -m 또는 -F 옵션으로 입력하십시오" #: builtin/notes.c:203 @@ -9179,7 +9795,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 "노트 내용은 %s에 남습니다" #: builtin/notes.c:233 builtin/tag.c:439 @@ -9192,52 +9808,76 @@ msgstr "'%s'을(를) 읽을 수 없습니다" msgid "could not open or read '%s'" msgstr "'%s'을(를) 열거나 읽을 수 없습니다" +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다." + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." +msgid "failed to read object '%s'." msgstr "'%s' 오브젝트 읽기에 실패했습니다." #: 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 "블롭이 아닌 '%s' 오브젝트에 대해 노트 데이터를 읽을 수 없습니다." -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "잘못된 형식의 입력 줄: '%s'." + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다" + +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "%s에서 노트를 %s 하기를 거부합니다 (refs/notes/ 밖임)" + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "파라미터가 너무 많습니다" -#: builtin/notes.c:376 builtin/notes.c:663 +#: builtin/notes.c:378 builtin/notes.c:665 #, c-format -msgid "No note found for object %s." +msgid "no note found for object %s." msgstr "%s 오브젝트에 대해 노트가 없습니다." -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "문자열로 노트 내용" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "파일 안에 노트 내용" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "지정한 노트 오브젝트를 재사용하고 편집합니다" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "지정한 노트 오브젝트를 재사용합니다" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "빈 노트 저장을 허용합니다" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "기존 노트를 바꿉니다" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9246,29 +9886,29 @@ msgstr "" "노트를 추가할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트" "를 덮어쓰려면 '-f' 옵션을 사용하십시오" -#: builtin/notes.c:450 builtin/notes.c:529 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "%s 오브젝트에 대한 기존 노트를 덮어씁니다\n" -#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "%s 오브젝트에 대한 노트를 제거합니다\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "표준 입력에서 오브젝트를 읽습니다" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "<명령>에 대한 다시쓰기 설정을 읽어들입니다 (--stdin 옵션 포함)" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "파라미터가 너무 적습니다" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9277,12 +9917,12 @@ msgstr "" "노트를 복사할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트" "를 덮어쓰려면 '-f' 옵션을 사용하십시오" -#: 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 "원본 %s 오브젝트에 대한 노트가 없습니다. 복사할 수 없습니다." -#: builtin/notes.c:587 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9291,20 +9931,52 @@ msgstr "" "-m/-F/-c/-C 옵션은 'edit' 하위 명령에 대해 사용을 권하지 않습니다.\n" "대신에 'git notes add -f -m/-F/-c/-C' 명령을 사용하십시오.\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "NOTES_MERGE_PARTIAL 레퍼런스 삭제에 실패했습니다" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "NOTES_MERGE_REF 레퍼런스 삭제에 실패했습니다" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "'git notes merge' 작업트리 제거에 실패했습니다" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "NOTES_MERGE_PARTIAL 레퍼런스 읽기에 실패했습니다" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "NOTES_MERGE_PARTIAL에서 커밋을 찾을 수 없습니다." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "NOTES_MERGE_PARTIAL에서 커밋을 파싱할 수 없습니다." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "NOTES_MERGE_REF 알아내기에 실패했습니다" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "노트 병합을 마치는데 실패했습니다" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "알 수 없는 노트 병합 전략 %s" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "일반 옵션" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "병합 옵션" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9312,274 +9984,273 @@ msgstr "" "주어진 전략을 사용해 노트 충돌을 해결합니다 (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "병합하지 않은 노트 커밋" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "병합하지 않은 노트를 커밋해 노트 병합을 마칩니다" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "노트 병합 해결 중지" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "노트 병합을 중지합니다" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "--commit, --abort, -s/--strategy 옵션을 섞어 쓸 수 없습니다" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" +#: 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 "알 수 없는 전략(-s/--strategy): %s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" +msgid "a notes merge into %s is already in-progress at %s" msgstr "%s 위치로 노트 병합이 이미 %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 "현재 노트 레퍼런스의 (%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 " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" -msgstr "자동 노트 병합이 실패했습니다. %s 안의 충돌을 바로잡고 결과를 'git notes merge --commit' 명령으로 커밋하십시오. 또는 'git notes merge --abort' 명령으로 병합을 중지하십시오.\n" +msgstr "" +"자동 노트 병합이 실패했습니다. %s 안의 충돌을 바로잡고 결과를 'git notes " +"merge --commit' 명령으로 커밋하십시오. 또는 'git notes merge --abort' 명령으" +"로 병합을 중지하십시오.\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "%s 오브젝트에 노트가 없습니다\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "없는 노트를 제거하려는 시도를 오류가 아닌 것으로 취급합니다" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "표준 입력에서 오브젝트 이름을 읽습니다" -#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "제거하지 않고, 보여주기만 합니다" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "잘라낸 노트를 알립니다" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "노트-레퍼런스" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "<노트-레퍼런스>에서 노트를 사용합니다" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" +msgid "unknown subcommand: %s" msgstr "알 수 없는 하위 명령: %s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<옵션>...] [< <레퍼런스목록> | < <오브젝트목록>]" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<옵션>...] <베이스이름> [< <레퍼런스목록> | < <오브젝트목록" ">]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "deflate 오류 (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "배트맵 쓰기를 하지 않습니다. 묶음은 pack.packSizeLimit 값에 따라 쪼개집니다" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "오브젝트 쓰는 중" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "묶음에 들어있지 않은 오브젝트가 있으므로, 비트맵 쓰기를 하지 않습니다" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "오브젝트 압축하는 중" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "지원하지 않는 인덱스 버전 %s" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "잘못된 인덱스 버전 '%s'" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "진행률을 표시하지 않습니다" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "진행률을 표시합니다" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "오브젝트 쓰기 단계에서 진행률을 표시합니다" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "진행률이 표시될 때 --all-progress와 비슷합니다" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "버전[,오프셋]" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "지정한 버전의 인덱스 형식에 따라 묶음 인덱스 파일을 씁니다" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "출력 묶음 파일의 최대 크기" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "보조 오브젝트 저장소에서 빌려온 오브젝트를 무시합니다" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "묶음 오브젝트를 무시합니다" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "묶음 윈도우를 오브젝트 단위로 제한합니다" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "묶음 윈도우를 오브젝트 단위에 추가로 메모리 단위로 제한합니다" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "결과물 묶음에서 허용되는 최대 길이의 델타 체인" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "기존 델타를 재사용합니다" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "기존 오브젝트를 재사용합니다" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA 오브젝트를 사용합니다" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "최상의 델타 일치를 검색하는데 스레드를 사용합니다" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "빈 묶음 출력을 만들지 않습니다" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "표준 입력에서 리비전 인자를 읽습니다" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "묶지 않는 오브젝트 수를 제한합니다" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "모든 레퍼런스에서 접근 가능한 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "reflog 항목에서 레퍼런스할 수 있는 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "인덱스에서< 레퍼런스하는 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "묶음을 표준 출력으로 출력합니다" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "묶음에 들어갈 오브젝트를 레퍼런스하는 태그 오브젝트를 포함합니다" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "접근 불가능 오브젝트를 보존합니다" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "느슨한 접근 불가능 오브젝트를 묶습니다" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "시각" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "<시각>보다 새로운 접근 불가능 오브젝트의 묶음을 풉니다" -#: builtin/pack-objects.c:2704 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "얇은 묶음을 만듭니다" -#: builtin/pack-objects.c:2706 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "얕은 가져오기에 적합한 묶음을 만듭니다" -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "해당하는 .keep 파일이 있는 묶음을 무시합니다" -#: builtin/pack-objects.c:2710 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "묶음 압축 단계" # FIXME: graft? -#: 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 "오브젝트 개수 세는 중" @@ -9619,65 +10290,56 @@ msgstr "<시각>보다 오래 된 오브젝트가 만료됩니다" msgid "cannot prune in a precious-objects repo" msgstr "precious-objects 저장소에서 잘라낼 수 없습니다" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "%s의 값이 올바르지 않습니다: %s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<옵션>] [<저장소> [<레퍼런스명세>...]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "병합 관련 옵션" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "변경 사항을 적용할 때 병합하는 대신 리베이스합니다" -#: builtin/pull.c:147 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "정방향 진행을 허용합니다" -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "리베이스 전과 후에 stash 및 stash pop을 자동으로 합니다" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "가져오기 관련 옵션" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "병렬적으로 풀을 실행할 하위모듈 개수" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff에 대해 잘못된 값: %s" -#: builtin/pull.c:379 git-sh-setup.sh:226 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"리베이스로 풀을 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다." - -#: builtin/pull.c:385 git-sh-setup.sh:252 -msgid "Additionally, your index contains uncommitted changes." -msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다." - -#: builtin/pull.c:387 git-sh-setup.sh:245 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"리베이스로 풀을 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "가져온 레퍼런스 중에 리베이스할 대상 후보가 없습니다." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "가져온 레퍼런스 중에 병합할 대상 후보가 없습니다." -#: builtin/pull.c:466 +#: builtin/pull.c:400 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9685,7 +10347,7 @@ msgstr "" "보통 이런 경우는 리모트 쪽에는 없는 와일드카드 레퍼런스명세가\n" "주어졌을 때 일어납니다." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9696,42 +10358,42 @@ msgstr "" "이 리모트는 현재 브랜치에 대해 기본으로 설정된 리모트가\n" "아니기 때문에, 명령행에서 브랜치를 지정해야 합니다." -#: builtin/pull.c:474 git-parse-remote.sh:73 +#: builtin/pull.c:408 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "현재 어떤 브랜치 위에도 있지 않습니다." -#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "어떤 브랜치를 대상으로 리베이스할지 지정하십시오." -#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "어떤 브랜치를 대상으로 병합할지 지정하십시오." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "자세한 정보는 git-pull(1) 페이지를 참고하십시오." -#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<리모트>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<브랜치>" -#: builtin/pull.c:489 git-parse-remote.sh:75 +#: builtin/pull.c:423 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "현재 브랜치에 추적 정보가 없습니다." -#: builtin/pull.c:498 git-parse-remote.sh:95 +#: builtin/pull.c:432 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "이 브랜치에 대한 추적 정보를 설정하려면 다음과 같이 할 수 있습니다:" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9740,19 +10402,27 @@ msgstr "" "설정에서 리모트의 '%s' 레퍼런스와 병합하도록 지정했지만,\n" "그런 레퍼런스를 가져오지 않았습니다." -#: builtin/pull.c:820 +#: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" msgstr "리베이스에 대해 --verify-signatures 옵션을 무시합니다" -#: builtin/pull.c:867 +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 옵션은 --rebase 옵션과 같이 써야 합니다." -#: builtin/pull.c:875 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "만들어지지 않은 브랜치를 인덱스에 추가된 변경 사항으로 업데이트합니다." -#: builtin/pull.c:903 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "리베이스로 풀하기" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "커밋하거나 스태시에 넣으십시오." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9763,7 +10433,7 @@ msgstr "" "작업 폴더를 %s 커밋에서 정방향\n" "진행합니다." -#: builtin/pull.c:908 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9780,11 +10450,11 @@ msgstr "" "$ git reset --hard\n" "복구됩니다." -#: builtin/pull.c:923 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다." -#: builtin/pull.c:927 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "여러 브랜치로 리베이스할 수 없습니다." @@ -10160,15 +10830,62 @@ msgstr "드문 체크아웃 필터 적용을 건너뜁니다" msgid "debug unpack-trees" msgstr "unpack-trees 디버깅" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1845 +#: builtin/receive-pack.c:793 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set 'receive.denyCurrentBranch' configuration variable to\n" +"'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" +"기본값으로 간략한 저장소가 아닌 현재 브랜치의 업데이트는 거부됩니다.\n" +"업데이트하면 인덱스와 작업 트리가 푸시한 내용과 일치하지 않게 되므로,\n" +"'git reset --hard'로 작업 트리를 HEAD에 맞춰야 합니다.\n" +"\n" +"리모트 저장소에서 'receive.denyCurrentBranch' 설정 변수를 'ignore'나\n" +"'warn'으로 설정하면 현재 브랜치로 푸시할 수 있습니다. 하지만 작업\n" +"트리의 내용을 푸시할 내용에 맞추는 게 아니라면 추천하지 않습니다.\n" +"\n" +"이 메시지를 보지 않고 기본 동작을 계속 하려면,\n" +"'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 "" +"기본값으로, 현재 브랜치의 삭제는 거부됩니다. 다음에 'git clone'할 때\n" +"아무 파일도 체크아웃하지 않게 되므로 혼동을 일으키기 때문입니다.\n" +"\n" +"'receive.denyDeleteCurrent' 설정 변수를 'ignore'나 'warn'으로 설정하면\n" +"(경고 메시지를 포함하거나 포함하지 않고) 현재 브랜치를 삭제할 수\n" +"있습니다.\n" +"\n" +"이 메시지를 보지 않으려면, 이 설정 변수를 'refuse'로 설정하십시오." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "출력 않기" -#: builtin/receive-pack.c:1859 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "디렉터리를 지정해야 합니다." @@ -10495,7 +11212,7 @@ msgstr "* 리모트 %s" msgid " Fetch URL: %s" msgstr " 가져오기 URL: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(URL 없음)" @@ -10531,7 +11248,7 @@ msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 리모트 브랜치:%s" -#: builtin/remote.c:1179 builtin/remote.c:1206 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr " (상태를 질의하지 않음)" @@ -10544,138 +11261,143 @@ msgstr[0] " 'git pull'에 사용할 로컬 브랜치를 설정:" msgid " Local refs will be mirrored by 'git push'" msgstr " 로컬 레퍼런스를 'git push'로 미러링할 예정" -#: builtin/remote.c:1203 +#: builtin/remote.c:1202 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 로컬 레퍼런스를 'git push'로 미러링%s:" -#: builtin/remote.c:1224 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "레퍼런스/리모트/<이름>/HEAD 값을 리모트에 맞게 설정합니다" -#: builtin/remote.c:1226 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "레퍼런스/리모트/<이름>/HEAD 값을 삭제합니다" -#: builtin/remote.c:1241 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "리모트 HEAD를 결정할 수 없습니다" -#: builtin/remote.c:1243 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "리모트 HEAD 브랜치가 여러개입니다. 다음 중 하나를 명시적으로 지정하십시오:" -#: builtin/remote.c:1253 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "%s을(를) 삭제할 수 없습니다" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "올바른 레퍼런스가 아닙니다: %s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "%s을(를) 설정할 수 없습니다" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %s의 연결이 끊어집니다!" -#: builtin/remote.c:1282 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %s의 연결이 끊어졌습니다!" -#: builtin/remote.c:1292 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "잘라냄: %s" -#: builtin/remote.c:1293 +#: builtin/remote.c:1292 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1309 +#: builtin/remote.c:1308 #, c-format msgid " * [would prune] %s" msgstr " * [잘라낼 예정] %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [잘라냄] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "가져온 후에 리모트를 잘라냅니다" -#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 +#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 #, c-format msgid "No such remote '%s'" msgstr "그런 리모트가 없습니다 ('%s')" -#: builtin/remote.c:1436 +#: builtin/remote.c:1435 msgid "add branch" msgstr "브랜치를 추가합니다" -#: builtin/remote.c:1443 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "리모트를 지정하지 않았습니다" -#: builtin/remote.c:1460 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "가져오기 URL이 아니라 푸시 URL을 질의합니다" -#: builtin/remote.c:1462 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "모든 URL을 리턴합니다" -#: builtin/remote.c:1490 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "'%s' 리모트에 대한 URL을 설정하지 않았습니다" -#: builtin/remote.c:1516 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "푸시 URL을 지정합니다" -#: builtin/remote.c:1518 +#: builtin/remote.c:1517 msgid "add URL" msgstr "URL을 추가합니다" -#: builtin/remote.c:1520 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "URL을 삭제합니다" -#: builtin/remote.c:1527 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add --delete 옵션을 둘다 쓰면 안 됩니다" -#: builtin/remote.c:1568 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "잘못된 오래전 URL 패턴: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "그런 URL이 없습니다: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "푸시용이 아닌 모든 URL을 삭제하지 않습니다" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "자세히 표시합니다 (하위 명령 앞에 와야 합니다)" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "알 수 없는 하위 명령: %s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<옵션>]" @@ -10862,8 +11584,8 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<커밋>]" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <트리-따위> [--] <경로>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<트리-따위>] [--] <경로>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -10983,27 +11705,27 @@ msgstr "인덱스 파일을 '%s' 리비전으로 리셋할 수 없습니다." msgid "Could not write new index file." msgstr "새 인덱스 파일을 쓸 수 없습니다." -#: builtin/rev-list.c:362 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list는 노트 표시를 지원하지 않습니다" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<옵션>] -- [<인자>...]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "인자로 넘긴 `--`를 유지합니다" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "첫번째 옵션이 아닌 인자 뒤에 파싱을 중지합니다" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "stuck long 형식으로 출력합니다" -#: 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" @@ -11096,7 +11818,7 @@ msgstr "여분의 빈 커밋을 유지합니다" msgid "revert failed" msgstr "되돌리기 실패" -#: builtin/revert.c:207 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "cherry-pick 실패" @@ -11258,70 +11980,123 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<베이스>]] [--list] [<레퍼런스>]" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:375 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "%s 무시. 레퍼런스를 %d개보다 많이 처리할 수 없습니다" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "%s와(과) 일치하는 레퍼런스가 없습니다" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "리모트 추적 및 로컬 브랜치를 표시합니다" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "리모트 추적 브랜치를 표시합니다" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "브랜치에 따른 '*!+-' 표시에 색을 입힙니다" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "공통 이전 커밋 뒤의 <n>개의 커밋을 표시합니다" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "--more=-1 옵션과 동일" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "이름 문자열을 표시하지 않습니다" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "현재 브랜치를 포함" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "커밋의 이름을 그 오브젝트 이름으로 붙입니다" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "가능한 병합 기준점을 표시합니다" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "다른 어떤 레퍼런스에서도 접근 불가능한 레퍼런스를 표시합니다" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "위상 순서에 따라 커밋을 표시합니다" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "첫 브랜치에 없는 커밋만 표시합니다" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "하나의 끝에서만 접근 가능한 병합을 표시합니다" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "가능하면 시간 순서를 유지하면서 위상 순서로 정렬" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "<n>[,<베이스>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "기준부터 시작해 최대 <n>개의 최근 ref-log 항목을 표시합니다" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog 옵션은 --all, --remotes, --independent, --merge-base 옵션과 호환되" +"지 않습니다" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "브랜치를 지정하지 않았고, HEAD가 올바르지 않습니다" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "--reflog 옵션은 브랜치 이름이 필요합니다" + +#: builtin/show-branch.c:733 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "한 번에 %d개 항목만 표시할 수 있습니다." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "그런 레퍼런스가 없습니다: %s" + +#: builtin/show-branch.c:829 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "레퍼런스를 %d개보다 많이 처리할 수 없습니다." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "'%s'은(는) 올바른 레퍼런스가 아닙니다." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "%s 커밋을 찾을 수 없음 (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11382,12 +12157,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 "그런 레퍼런스가 없습니다: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 #, c-format msgid "Expecting a full ref name, got %s" msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s" @@ -11397,74 +12172,93 @@ msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s" msgid "cannot strip one component off url '%s'" msgstr "'%s' URL 하나의 단계를 잘라낼 수 없습니다" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 -#: builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 +#: builtin/submodule--helper.c:590 msgid "alternative anchor for relative paths" msgstr "상대 경로에 사용할 또다른 기준" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]" -#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 +#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules에서 하위 모듈 경로 '%s'에 대한 URL이 없습니다" -#: builtin/submodule--helper.c:364 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "하위 모듈 경로 '%s'에 대한 URL을 등록하는데 실패했습니다" -#: builtin/submodule--helper.c:368 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%3$s' 경로에 대해 '%1$s' (%2$s) 하위 모듈 등록\n" -#: builtin/submodule--helper.c:378 +#: builtin/submodule--helper.c:383 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "경고: '%s' 하위 모듈에 대해 커맨드 업데이트 모드가 제안되었습니다\n" -#: builtin/submodule--helper.c:385 +#: builtin/submodule--helper.c:390 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' 하위 모듈에 대해 업데이트 모드 등록이 실패했습니다" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "하위 모듈 초기화에 출력을 하지 않습니다" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<경로>]" -#: builtin/submodule--helper.c:430 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <경로>" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "경로 '%s'에 대해 .gitmodules에 있는 하위모듈 매핑이 없습니다" -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "'%s' 하위 모듈에 보조 오브젝트를 추가할 수 없습니다: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "submodule.alternateErrorStrategy에 대한 값이('%s') 알 수 없는 값입니다" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "submodule.alternateLocation에 대한 값이('%s') 알 수 없는 값입니다" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "새 하위 모듈을 복제할 대상 위치" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "새 하위 모듈 이름" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "하위 모듈을 복제해 올 URL" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "얕은 복제에 사용할 깊이" -#: builtin/submodule--helper.c:504 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "복제 진행 상황을 항상 표시합니다" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11472,108 +12266,110 @@ msgstr "" "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소" ">] [--name <이름>] [--depth <깊이>] --url <url> --path <경로>" -#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 +#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 #, c-format msgid "could not create directory '%s'" msgstr "'%s' 디렉터리를 만들 수 없습니다" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s'에서 하위 모듈 경로 '%s'에 복제하는데 실패했습니다" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "%s 파일을 닫을 수 없습니다" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s'에 대한 하위 모듈 디렉터리를 가져올 수 없습니다" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "'%s' 하위 모듈 경로가 초기화되지 않았습니다" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init'을 하려고 한 것 아니었습니까?" -#: builtin/submodule--helper.c:641 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "병합하지 하위 모듈 %s 건너뜀" -#: builtin/submodule--helper.c:662 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "하위 모듈 '%s' 건너뜀" -#: builtin/submodule--helper.c:792 +#: builtin/submodule--helper.c:913 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' 복제하는데 실패했습니다. 재시도 예정" -#: builtin/submodule--helper.c:803 +#: builtin/submodule--helper.c:924 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "두번째 '%s' 복제하는데 실패했습니다. 중지합니다" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "작업 폴더로 가는 경로" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "작업 폴더로 가는 경로, 내장된 하위 모듈의 경계 통과" -#: builtin/submodule--helper.c:831 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout 또는 none" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "지정한 개수의 리비전에서 잘린 얕은 복제를 만듭니다" -#: builtin/submodule--helper.c:838 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "병렬 작업 개수" -#: builtin/submodule--helper.c:840 +#: builtin/submodule--helper.c:961 msgid "whether the initial clone should follow the shallow recommendation" msgstr "최초 복제가 얕은 복제 추천을 따를지 여부" -#: builtin/submodule--helper.c:841 +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "복제 과정을 표시하지 않습니다" -#: builtin/submodule--helper.c:846 +#: builtin/submodule--helper.c:969 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]" -#: builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "파라미터 업데이트에 값이 잘못되었습니다" -#: builtin/submodule--helper.c:927 +#: builtin/submodule--helper.c:1050 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" -msgstr "하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 프로젝트에 브랜치가 없습니다" +msgstr "" +"하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 " +"프로젝트에 브랜치가 없습니다" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "submodule--helper 하위 명령은 하위 명령으로 호출해야 합니다" -#: builtin/submodule--helper.c:984 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다" @@ -11796,7 +12592,7 @@ msgstr "파라미터가 너무 많습니다" #: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." -msgstr "'%s'은9는) 올바른 태그 이름이 아닙니다." +msgstr "'%s'은(는) 올바른 태그 이름이 아닙니다." #: builtin/tag.c:463 #, c-format @@ -11808,7 +12604,7 @@ msgstr "태그 '%s'이(가) 이미 있습니다" msgid "Updated tag '%s' (was %s)\n" msgstr "태그 '%s' 업데이트 (과거 %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "오브젝트 묶음 푸는 중" @@ -11870,132 +12666,148 @@ msgstr "디렉터리를 삭제한 후에 디렉터리 정보가 바뀌지 않았 msgid " OK" msgstr " 오케이" -#: builtin/update-index.c:575 +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<옵션>] [--] [<파일>...]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "인덱스에 업데이트가 필요하더라도 새로 고침을 계속합니다" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "새로 고침: 하위 모듈 무시" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "새 파일을 무시할 수 않습니다" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "디렉터리를 파일로, 또는 그 반대로 바꿀 수 있게 허용합니다" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "작업폴더에서 알림 파일이 없습니다" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "인덱스에 병합하지 않은 항목이 있어도 새로 고칩니다" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "파일 정보를 새로 고칩니다" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "--refresh와 동일하지만, assume-unchanged 설정을 무시합니다" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<모드>,<오브젝트>,<경로>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "지정한 항목을 인덱스에 추가합니다" -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "파일을 \"바꾸지 않음\"으로 표시합니다" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "바꾸지 않음으로 가정 (assumed-unchanged) 비트를 지웁니다" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "파일을 인덱스 전용으로 (\"index-only\") 표시합니다" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "작업폴더 건너뛰기 (skip-worktree) 비트를 지웁니다" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "" "인덱스에만 추가합니다. 내용을 오브젝트 데이터베이스에 추가하지 않습니다" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "작업 폴더에 있어도 해당 경로를 제거합니다" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "--stdin과 같이 사용: 입력 줄은 NUL 바이트로 끝납니다" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "표준 입력에서 업데이트할 경로의 목록을 읽습니다" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "표준 입력에서 읽은 항목을 인덱스에 추가합니다" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "경로 목록에 대해 #2 및 #3 스테이징을 다시 합니다" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "HEAD와 다른 항목만 업데이트합니다" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "작업 폴더에 없는 파일을 무시합니다" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "표준 출력에 동작을 알립니다" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "저장한 해결되지 않은 충돌을 무시합니다 (사용자용 명령 용도)" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "인덱스를 이 형식으로 씁니다" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "스플릿 인덱스를 켜거나 끕니다" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "추적하지 않는 캐시 사용을 켜거나 끕니다" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "파일 시스템이 추적하지 않는 캐시를 지원하는지 검사합니다" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합니다" -#: builtin/update-index.c:1134 +#: builtin/update-index.c:1119 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" +"core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 " +"않으려면 이 값을 제거하거나 바꾸십시오." + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" -msgstr "추적되지 않는 캐시를 사용하지 않습니다" +msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다" + +#: 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값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려" +"면 이 값을 제거하거나 바꾸십시오." -#: builtin/update-index.c:1146 +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "'%s'에 대해 추적되지 않는 캐시를 사용하지 않습니다" @@ -12192,26 +13004,40 @@ msgstr "하위 디렉터리 <접두어>에 대해 트리 오브젝트를 씁니 msgid "only useful for debugging" msgstr "디버깅 용도로만 사용" -#: upload-pack.c:20 +#: upload-pack.c:22 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<옵션>] <디렉터리>" -#: upload-pack.c:837 +#: upload-pack.c:1028 msgid "quit after a single request/response exchange" msgstr "하나의 요청/응답 교환 뒤에 끝납니다" -#: upload-pack.c:839 +#: upload-pack.c:1030 msgid "exit immediately after initial ref advertisement" msgstr "최초 레퍼런스 알림 뒤에 즉시 끝납니다" -#: upload-pack.c:841 +#: upload-pack.c:1032 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ 폴더를 시도하지 않습니다." +msgstr "" +"<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ 폴더를 시도하지 않습니다." -#: upload-pack.c:843 +#: upload-pack.c:1034 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "<n>초 동안 반응이 없으면 전송을 중지합니다" +#: credential-cache--daemon.c:223 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"소켓 디렉터리의 권한이 너무 느슨합니다. 다른 사용자가\n" +"캐시에 들어 있는 비밀 정보를 읽을 수 있습니다. 다음을 실행해 보십시오:\n" +"\n" +"\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "디버깅 메시지를 표준오류로 출력합니다" @@ -12226,7 +13052,12 @@ msgstr "" "목록을 볼 수 있습니다. 특정 하위 명령어나 개념에 대해 읽어 보려면 'git help\n" "<명령>' 또는 'git help <개념>' 명령을 실행하십시오." -#: http.c:323 +# HTTP delegation +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "딜리게이션 컨트롤은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "공개 키 고정은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다" @@ -12342,15 +13173,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 "SHA-1 표시에 <n>개의 숫자를 사용합니다" @@ -12566,7 +13397,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 @@ -12752,6 +13583,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 "현재 작업 폴더 상태를 저장할 수 없습니다" @@ -12792,6 +13627,11 @@ msgstr "" "오류: 'stash save'에 대해 알 수 없는 옵션: $option\n" " 메시지를 넘기려면, 다음과 같이 쓰십시오: git stash save -- '$option'" +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" +"--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다" + #: git-stash.sh:259 msgid "No local changes to save" msgstr "저장할 로컬 변경 사항이 없습니다" @@ -12813,96 +13653,100 @@ msgstr "작업 폴더와 $stash_msg 인덱스 상태를 저장했습니다" msgid "Cannot remove worktree changes" msgstr "작업폴더 변경 사항을 제거할 수 없습니다" -#: git-stash.sh:404 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "알 수 없는 옵션: $opt" -#: git-stash.sh:414 +#: git-stash.sh:416 msgid "No stash found." msgstr "스태시가 없습니다." -#: git-stash.sh:421 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "너무 많은 리비전을 지정했습니다: $REV" -#: git-stash.sh:427 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference은(는) 올바른 레퍼런스가 아닙니다" -#: git-stash.sh:455 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args'은(는) 스태시 커밋이 아닙니다" -#: git-stash.sh:466 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args'은(는) 스태시 레퍼런스가 아닙니다" -#: git-stash.sh:474 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "인덱스를 새로 고칠 수 없습니다" -#: git-stash.sh:478 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "병합 도중에 스태시를 적용할 수 없습니다" -#: git-stash.sh:486 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "인덱스에 충돌. --index 없이 시도해 보십시오." -#: git-stash.sh:488 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "인덱스 트리를 저장할 수 없습니다" -#: git-stash.sh:522 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "스태시에서 추적하지 않는 파일을 복구할 수 없습니다" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "수정한 파일을 스테이지에서 뺄 수 없습니다" -#: git-stash.sh:537 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "인덱스가 스태시에서 빠졌습니다." -#: git-stash.sh:551 +#: git-stash.sh:562 msgid "The stash is kept in case you need it again." msgstr "다시 필요할 때를 대비해 스태시를 보관합니다." -#: git-stash.sh:560 +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} 지움 ($s)" -#: git-stash.sh:561 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: 스태시 항목을 지울 수 없습니다" -#: git-stash.sh:569 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "브랜치 이름을 지정하지 않았습니다" -#: git-stash.sh:641 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)" -#: git-submodule.sh:183 +#: git-submodule.sh:184 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "상대 경로는 작업 폴더의 최상위에서만 쓸 수 있습니다" -#: git-submodule.sh:193 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "저장소 URL: '$repo' 값은 절대 경로거나 ./ 또는 ../로 시작해야 합니다." -#: git-submodule.sh:210 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path'은(는) 이미 인덱스에 있습니다" -#: git-submodule.sh:214 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12913,22 +13757,22 @@ msgstr "" "$sm_path\n" "정말로 추가하려면 -f 옵션을 사용하십시오." -#: git-submodule.sh:232 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "'$sm_path'의 기존 저장소를 인덱스에 추가합니다" -#: git-submodule.sh:234 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path'이(가) 이미 있고 올바른 git 저장소가 아닙니다" -#: git-submodule.sh:242 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "'$sm_name'에 대한 깃 디렉터리가 로컬에서 리모트가 있는 채로 있습니다:" -#: git-submodule.sh:244 +#: git-submodule.sh:245 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -12943,47 +13787,47 @@ msgstr "" "'--force' 옵션을 사용하십시오. 로컬 깃 디렉터리가 올바른 저장소가 아니거나\n" "무슨 의미인지 잘 모르겠으면 '--name' 옵션으로 다른 이름을 선택하십시오." -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다." -#: git-submodule.sh:262 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 체크아웃할 수 없습니다" -#: git-submodule.sh:267 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 추가하는데 실패했습니다" -#: git-submodule.sh:276 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "'$sm_path' 하위 모듈을 등록하는데 실패했습니다" -#: git-submodule.sh:323 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "'$displaypath' 들어감" -#: git-submodule.sh:343 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "'$displaypath'에서 멈춤. 스크립트가 0이 아닌 상태를 리턴함." -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "경로명세 및 --all 옵션은 호환되지 않습니다" -#: git-submodule.sh:419 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "정말로 모든 하위 모듈 초기화를 해제하려면 '--all'을 사용하십시오" -#: git-submodule.sh:439 +#: git-submodule.sh:440 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -12992,7 +13836,7 @@ msgstr "" "하위 모듈 작업 폴더 '$displaypath'에 .git 디렉터리가 들어 있습니다\n" "(정말로 그 커밋 내역까지 포함해 제거하려면 'rm -rf'를 사용하십시오)" -#: git-submodule.sh:447 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13001,136 +13845,136 @@ msgstr "" "하위 모듈 작업 폴더에 ('$displaypath') 로컬 수정 사항이 있습니다. 버리려면 '-" "f'를 사용하십시오" -#: git-submodule.sh:450 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "'$displaypath' 디렉터리를 지웁니다" -#: git-submodule.sh:451 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다" -#: git-submodule.sh:454 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다" -#: git-submodule.sh:463 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "'$name' 하위 모듈이 ($url) '$displaypath' 경로에 대해 등록되지 않았습니다" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "하위 모듈 경로에서 ('$displaypath') 현재 리비전을 찾을 수 없습니다" -#: git-submodule.sh:622 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "하위 모듈 경로 '$sm_path'에서 가져올 수 없습니다" -#: git-submodule.sh:627 +#: git-submodule.sh:632 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" -msgstr "하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 없습니다" +msgstr "" +"하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 " +"없습니다" -#: git-submodule.sh:645 +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 가져올 수 없습니다" -#: git-submodule.sh:651 +#: git-submodule.sh:656 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." -msgstr "'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니다. 이 커밋을 직접 가져오는데 실패했습니다." +msgstr "" +"'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니" +"다. 이 커밋을 직접 가져오는데 실패했습니다." -#: git-submodule.sh:658 +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 체크아웃할 수 없습니다" -#: git-submodule.sh:659 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체크아웃" -#: git-submodule.sh:663 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 리베이스할 수 없습니다" -#: git-submodule.sh:664 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베이스" -#: git-submodule.sh:669 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1' 병합할 수 없습니다" -#: git-submodule.sh:670 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "하위 모듈 경로 '$displaypath': '$sha1'에서 병합" -#: git-submodule.sh:675 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "'$command $sha1' 실행이 하위 모듈 경로 '$displaypath'에서 실패했습니다" -#: git-submodule.sh:676 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'" -#: git-submodule.sh:707 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "재귀적으로 하위 모듈 경로 '$displaypath'에 들어가는데 실패했습니다" -#: git-submodule.sh:815 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "--cached 옵션은 --files 옵션과 같이 쓸 수 없습니다" -#: git-submodule.sh:867 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "예상치 못한 모드 $mod_dst" -#: git-submodule.sh:887 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 경고: '$display_name'에 '$sha1_src' 커밋이 들어있지 않습니다" -#: git-submodule.sh:890 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 경고: '$display_name'에 '$sha1_dst' 커밋이 들어있지 않습니다" -#: git-submodule.sh:893 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " 경고: '$display_name'에 '$sha1_src' 및 '$sha1_dst' 커밋이 들어있지 않습니다" -#: git-submodule.sh:918 -msgid "blob" -msgstr "블롭" - -#: git-submodule.sh:1040 +#: git-submodule.sh:1045 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다" -#: git-submodule.sh:1107 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화" @@ -13175,13 +14019,17 @@ msgstr "" msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "\n줄을 제거하지 않습니다. 커밋을 제거하려면 명시적으로 'drop'을 사용하십시오.\n" +msgstr "" +"\n" +"줄을 제거하지 않습니다. 커밋을 제거하려면 명시적으로 'drop'을 사용하십시오.\n" #: git-rebase--interactive.sh:166 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "\n여기 줄을 제거하면 해당 커밋을 잃어버립니다!\n" +msgstr "" +"\n" +"여기 줄을 제거하면 해당 커밋을 잃어버립니다!\n" #: git-rebase--interactive.sh:202 #, sh-format @@ -13246,166 +14094,42 @@ msgstr "$sha1 병합을 다시 하는데 오류" msgid "Could not pick $sha1" msgstr "$sha1을 빼오기 할 수 없습니다" -#: git-rebase--interactive.sh:408 git-rebase--interactive.sh:474 -msgid "This is the 1st commit message:" -msgstr "1번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:409 -msgid "This is the 2nd commit message:" -msgstr "2번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:410 -msgid "This is the 3rd commit message:" -msgstr "3번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:411 -msgid "This is the 4th commit message:" -msgstr "4번째 커밋 메시지입니다:" +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "커밋 메시지 #${n}번입니다:" #: git-rebase--interactive.sh:412 -msgid "This is the 5th commit message:" -msgstr "5번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:413 -msgid "This is the 6th commit message:" -msgstr "6번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:414 -msgid "This is the 7th commit message:" -msgstr "7번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:415 -msgid "This is the 8th commit message:" -msgstr "8번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:416 -msgid "This is the 9th commit message:" -msgstr "9번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:417 -msgid "This is the 10th commit message:" -msgstr "10번째 커밋 메시지입니다:" - -#. TRANSLATORS: if the language you are translating into -#. doesn't allow you to compose a sentence in this fashion, -#. consider translating as if this and the following few strings -#. were "This is the commit message ${n}:" -#: git-rebase--interactive.sh:422 #, sh-format -msgid "This is the ${n}th commit message:" -msgstr "${n}번째 커밋 메시지입니다:" +msgid "The commit message #${n} will be skipped:" +msgstr "#${n}번째 커밋 메시지를 건너뜁니다:" #: git-rebase--interactive.sh:423 #, sh-format -msgid "This is the ${n}st commit message:" -msgstr "${n}번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:424 -#, sh-format -msgid "This is the ${n}nd commit message:" -msgstr "${n}번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:425 -#, sh-format -msgid "This is the ${n}rd commit message:" -msgstr "${n}번째 커밋 메시지입니다:" - -#: git-rebase--interactive.sh:426 -#, sh-format -msgid "This is the commit message ${n}:" -msgstr "커밋 메시지 ${n}입니다:" - -#: git-rebase--interactive.sh:432 -msgid "The 1st commit message will be skipped:" -msgstr "1번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:433 -msgid "The 2nd commit message will be skipped:" -msgstr "2번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:434 -msgid "The 3rd commit message will be skipped:" -msgstr "3번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:435 -msgid "The 4th commit message will be skipped:" -msgstr "4번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:436 -msgid "The 5th commit message will be skipped:" -msgstr "5번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:437 -msgid "The 6th commit message will be skipped:" -msgstr "6번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:438 -msgid "The 7th commit message will be skipped:" -msgstr "7번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:439 -msgid "The 8th commit message will be skipped:" -msgstr "8번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:440 -msgid "The 9th commit message will be skipped:" -msgstr "9번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:441 -msgid "The 10th commit message will be skipped:" -msgstr "10번째 커밋 메시지를 건너뜁니다:" - -#. TRANSLATORS: if the language you are translating into -#. doesn't allow you to compose a sentence in this fashion, -#. consider translating as if this and the following few strings -#. were "The commit message ${n} will be skipped:" -#: git-rebase--interactive.sh:446 -#, sh-format -msgid "The ${n}th commit message will be skipped:" -msgstr "${n}번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:447 -#, sh-format -msgid "The ${n}st commit message will be skipped:" -msgstr "${n}번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:448 -#, sh-format -msgid "The ${n}nd commit message will be skipped:" -msgstr "${n}번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:449 -#, sh-format -msgid "The ${n}rd commit message will be skipped:" -msgstr "${n}번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:450 -#, sh-format -msgid "The commit message ${n} will be skipped:" -msgstr "${n}번째 커밋 메시지를 건너뜁니다:" - -#: git-rebase--interactive.sh:462 -#, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "커밋 $count개가 섞인 결과입니다." -#: git-rebase--interactive.sh:470 +#: git-rebase--interactive.sh:431 #, sh-format msgid "Cannot write $fixup_msg" msgstr "$fixup_msg를 쓸 수 없습니다" -#: git-rebase--interactive.sh:473 +#: git-rebase--interactive.sh:434 msgid "This is a combination of 2 commits." msgstr "커밋 2개가 섞인 결과입니다." -#: git-rebase--interactive.sh:514 git-rebase--interactive.sh:557 -#: git-rebase--interactive.sh:560 +#: git-rebase--interactive.sh:435 +msgid "This is the 1st commit message:" +msgstr "1번째 커밋 메시지입니다:" + +#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 +#: git-rebase--interactive.sh:521 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "다음을 적용할(apply) 수 없습니다: $sha1... $rest" -#: git-rebase--interactive.sh:588 +#: git-rebase--interactive.sh:549 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -13418,31 +14142,31 @@ msgstr "" "대부분의 경우 빈 커밋 메시지 때문이거나, 또는 커밋 전 후크가 실패했기\n" "때문입니다. 커밋 메시지를 수정하기 전에 이 문제를 먼저 해결해야 합니다." -#: git-rebase--interactive.sh:603 +#: git-rebase--interactive.sh:564 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "다음에서 멈춥니다: $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:618 +#: git-rebase--interactive.sh:579 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "이전 커밋 없이 '$squash_style' 수행할 수 없습니다" -#: git-rebase--interactive.sh:660 +#: git-rebase--interactive.sh:621 #, sh-format msgid "Executing: $rest" msgstr "실행 중: $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:629 #, sh-format msgid "Execution failed: $rest" msgstr "실행 실패: $rest" -#: git-rebase--interactive.sh:670 +#: git-rebase--interactive.sh:631 msgid "and made changes to the index and/or the working tree" msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다" -#: git-rebase--interactive.sh:672 +#: git-rebase--interactive.sh:633 msgid "" "You can fix the problem, and then run\n" "\n" @@ -13453,7 +14177,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:685 +#: git-rebase--interactive.sh:646 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -13468,25 +14192,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:696 +#: git-rebase--interactive.sh:657 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "알 수 없는 명령: $command $sha1 $rest" -#: git-rebase--interactive.sh:697 +#: git-rebase--interactive.sh:658 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오." -#: git-rebase--interactive.sh:732 +#: git-rebase--interactive.sh:693 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "성공적으로 리베이스했고 $head_name 업데이트했습니다." -#: git-rebase--interactive.sh:779 +#: git-rebase--interactive.sh:740 msgid "Could not skip unnecessary pick commands" msgstr "불필요한 빼오기 명령을 건너뛸 수 없습니다" -#: git-rebase--interactive.sh:937 +#: git-rebase--interactive.sh:898 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -13495,7 +14219,7 @@ msgstr "" "경고: 다음 줄에서 해당 SHA-1이 없거나 커밋이 아닙니다:\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:931 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -13504,11 +14228,11 @@ msgstr "" "경고: 다음 줄에서 명령어가 무엇인지 알 수 없습니다:\n" " - $line" -#: git-rebase--interactive.sh:1009 +#: git-rebase--interactive.sh:970 msgid "could not detach HEAD" msgstr "HEAD는 분리할 수 없습니다" -#: git-rebase--interactive.sh:1047 +#: git-rebase--interactive.sh:1008 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -13516,7 +14240,7 @@ msgstr "" "경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n" "버려진 커밋 (최근에서 과거 순서):" -#: git-rebase--interactive.sh:1055 +#: git-rebase--interactive.sh:1016 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -13524,31 +14248,39 @@ msgid "" "warnings.\n" "The possible behaviours are: ignore, warn, error." msgstr "" -"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시오.\n" +"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시" +"오.\n" "\n" -"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니다.\n" +"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니" +"다.\n" "가능한 동작은: ignore, warn, error" -#: git-rebase--interactive.sh:1066 +#: git-rebase--interactive.sh:1027 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " "Ignoring." -msgstr "rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시합니다." +msgstr "" +"rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시" +"합니다." -#: git-rebase--interactive.sh:1083 -msgid "You can fix this with 'git rebase --edit-todo'." -msgstr "'git rebase --edit-todo' 명령으로 바로잡을 수 있습니다." +#: git-rebase--interactive.sh:1044 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "" +"'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명" +"령을 실행합니다." -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "아니면 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다." -#: git-rebase--interactive.sh:1108 +#: git-rebase--interactive.sh:1069 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다" -#: git-rebase--interactive.sh:1113 +#: git-rebase--interactive.sh:1074 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -13561,7 +14293,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 "" @@ -13579,11 +14311,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1130 +#: git-rebase--interactive.sh:1091 msgid "Error trying to find the author identity to amend commit" msgstr "커밋을 수정한 작성자 신원을 찾는데 오류" -#: git-rebase--interactive.sh:1135 +#: git-rebase--interactive.sh:1096 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -13591,11 +14323,11 @@ msgstr "" "작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n" "커밋하고 'git rebase --continue' 명령을 다시 실행하십시오." -#: git-rebase--interactive.sh:1140 git-rebase--interactive.sh:1144 +#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 msgid "Could not commit staged changes." msgstr "스테이징한 변경 사항은 커밋할 수 없습니다." -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:1129 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -13609,50 +14341,49 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1176 git-rebase--interactive.sh:1337 +#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 msgid "Could not execute editor" msgstr "편집기를 실행할 수 없습니다" -#: git-rebase--interactive.sh:1184 -msgid "You need to set your committer info first" -msgstr "먼저 커밋하는 사람 정보를 설정해야 합니다" - -#: git-rebase--interactive.sh:1192 +#: git-rebase--interactive.sh:1150 #, sh-format msgid "Could not checkout $switch_to" msgstr "$switch_to를 체크아웃할 수 없습니다" -#: git-rebase--interactive.sh:1197 +#: git-rebase--interactive.sh:1155 msgid "No HEAD?" msgstr "HEAD가 없습니다?" -#: git-rebase--interactive.sh:1198 +#: git-rebase--interactive.sh:1156 #, sh-format msgid "Could not create temporary $state_dir" msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다" -#: git-rebase--interactive.sh:1200 +#: git-rebase--interactive.sh:1158 msgid "Could not mark as interactive" msgstr "대화형으로 표시할 수 없습니다." -#: git-rebase--interactive.sh:1210 git-rebase--interactive.sh:1215 +#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 msgid "Could not init rewritten commits" msgstr "다시 작성된 커밋을 초기화할 수 없습니다" -#: git-rebase--interactive.sh:1315 +#: git-rebase--interactive.sh:1273 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "리베이스 $shortrevisions, $shortonto 위로 (명령 $todocount개)" -#: git-rebase--interactive.sh:1320 +#: git-rebase--interactive.sh:1278 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" -msgstr "\n하지만 모두 제거할 경우, 리베이스를 중지합니다.\n\n" +msgstr "" +"\n" +"하지만 모두 제거할 경우, 리베이스를 중지합니다.\n" +"\n" -#: git-rebase--interactive.sh:1327 +#: git-rebase--interactive.sh:1285 msgid "Note that empty commits are commented out" msgstr "단 빈 커밋은 주석 처리되었습니다." @@ -13679,6 +14410,11 @@ 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." @@ -13688,11 +14424,20 @@ msgstr "$action 할 수 없습니다: 스테이징하지 않은 변경 사항이 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "리베이스할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"리베이스로 풀을 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." + #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "$action 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다." +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다." + #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "이 명령은 작업 폴더의 최상위에서만 쓸 수 있습니다." diff --git a/po/pt_PT.po b/po/pt_PT.po index c8658df..59d8ef1 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -9,8 +9,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-09-03 12:00+0000\n" +"POT-Creation-Date: 2016-11-22 22:10+0800\n" +"PO-Revision-Date: 2016-11-13 16:37+0000\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -102,6 +102,631 @@ msgstr "" " git checkout -b <novo-nome-ramo>\n" "\n" +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "opção de espaço em branco não reconhecida '%s'" + +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "opção de ignorar espaço em branco não reconhecida '%s'" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject e --3way não podem ser usados juntos." + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached e --3way não podem ser usados juntos." + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way fora de um repositório" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index fora de um repositório" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached fora de um repositório" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Não é possível preparar a regexp de carimbo de data/hora %s" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec retornou %d para a entra: %s" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %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 incorreto - esperava-se /dev/null, obteve-se %s na linha " +"%d" + +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é " +"inconsistente" + +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é " +"inconsistente" + +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d" + +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recontagem: linha inesperada: %.*s" + +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragmento de patch sem cabeçalho na linha %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] "" +"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " +"%d componente do caminho (linha %d)" +msgstr[1] "" +"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " +"%d componentes de caminho (linha %d)" + +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "o cabeçalho do git diff não revela o nome do ficheiro (linha %d)" + +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "o novo ficheiro depende de conteúdos antigos" + +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "o ficheiro eliminado ainda tem conteúdos" + +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "patch corrompido na linha %d" + +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "o novo ficheiro %s depende de conteúdos antigos" + +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "o ficheiro eliminado %s ainda tem conteúdos" + +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado" + +#: apply.c:1984 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "patch binário corrompido na linha %d: %.*s" + +#: apply.c:2021 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "patch binário não reconhecido na linha %d" + +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "patch incompreensível na linha %d" + +#: apply.c:2274 +#, c-format +msgid "unable to read symlink %s" +msgstr "não é possível ler a ligação simbólica %s" + +#: apply.c:2278 +#, c-format +msgid "unable to open or read %s" +msgstr "não é possível abrir ou ler %s" + +#: apply.c:2931 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "início de linha inválido: '%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] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)." +msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)." + +#: apply.c:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d" + +#: apply.c:3068 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"ao procura por:\n" +"%.*s" + +#: apply.c:3090 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "falta de dados do patch binário '%s'" + +#: apply.c:3098 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" +"não é possível aplicar o reverso de um patch binário a '%s' sem o excerto " +"reverso" + +#: apply.c:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "" +"não é possível aplicar patch binário a '%s' sem linha de índice completa" + +#: apply.c:3154 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"o patch aplica-se a '%s' (%s), que não corresponde aos conteúdos atuais." + +#: apply.c:3162 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "o patch aplica-se a um '%s' vazio mas não está vazio" + +#: apply.c:3180 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "não é possível ler a postimage necessária %s de '%s'" + +#: apply.c:3193 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "o patch binário não foi aplicado corretamente a '%s'" + +#: apply.c:3199 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, " +"obteve-se %s)" + +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "falha ao aplicar o patch: %s:%ld" + +#: apply.c:3342 +#, c-format +msgid "cannot checkout %s" +msgstr "não é possível extrair %s" + +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#, c-format +msgid "failed to read %s" +msgstr "falha ao ler %s" + +#: apply.c:3398 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "a ler '%s' indicado por uma ligação simbólica" + +#: apply.c:3427 apply.c:3667 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "o caminho %s foi eliminado ou mudou de nome" + +#: apply.c:3510 apply.c:3681 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: não existe no índice" + +#: apply.c:3519 apply.c:3689 +#, c-format +msgid "%s: does not match index" +msgstr "%s: não tem correspondência no índice" + +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "" +"o repositório não tem o blob necessário para recorrer a integração com 3 " +"pontos." + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "A recorrer a integração com 3 pontos...\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "não é possível ler o conteúdo atual de '%s'" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "Falha a recorrer a integração com 3 pontos...\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Patch aplicado a '%s' com conflitos.\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Patch aplicado a '%s' com sucesso.\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "patch de remoção deixa conteúdos no ficheiro" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "%s: tipo errado" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s é do tipo %o, esperado %o" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "caminho inválido '%s'" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: já existe no índice" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: já existe no diretório de trabalho" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)" + +#: apply.c:3945 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s" + +#: apply.c:3965 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica" + +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: patch não se aplica com sucesso" + +#: apply.c:3984 +#, c-format +msgid "Checking patch %s..." +msgstr "A verificar o patch %s..." + +#: apply.c:4075 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "falta informação de sha1 ou não é útil para o submódulo %s" + +#: apply.c:4082 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "alteração de modo de %s que não está na HEAD atual" + +#: apply.c:4085 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "falta informação de sha1 ou não é útil (%s)." + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "falha ao invocar make_cache_entry em '%s'" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "não foi possível adicionar %s ao índice temporário" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "não foi possível escrever índice temporário para %s" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "não é possível remover %s do índice" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "patch corrompido no submódulo %s" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "não é possível obter estado do novo ficheiro criado '%s'" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" +"não é possível criar armazenamento de segurança do ficheiro recém-criado %s" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "não é possível adicionar %s à cache" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "falha ao escrever para '%s'" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "a fechar o ficheiro '%s'" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "não é possível escrever o ficheiro '%s' com o modo %o" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Patch %s aplicado com sucesso." + +#: apply.c:4518 +msgid "internal error" +msgstr "erro interno" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "A aplicar patch %%s com %d rejeição..." +msgstr[1] "A aplicar patch %%s com %d rejeições..." + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "não é possível abrir %s" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Excerto nº%d aplicado com sucesso." + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Excerto nº%d rejeitado." + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Patch '%s' ignorado." + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "entrada não reconhecida" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "não foi possível ler o ficheiro de índice" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "não é possível abrir o patch '%s': %s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "%d erro de espaço em branco reprimido" +msgstr[1] "%d erros de espaço em branco reprimidos" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d linha adiciona erros de espaço em branco." +msgstr[1] "%d linhas adicionam erros de espaço em branco." + +#: 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 linha aplicada depois de corrigir erros de espaço em branco." +msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco." + +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "Não foi possível escrever novo ficheiro de índice" + +#: 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 "caminho" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "não aplicar alterações que correspondam ao caminho fornecido" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "aplicar alterações que correspondam ao caminho fornecido" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "num" + +#: apply.c:4926 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "ignorar adições feitas pelo patch" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "mostrar número de linhas adicionadas e removidas em notação decimal" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "garantir que o patch pode ser aplicado ao índice atual" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "aplicar um patch sem tocar na árvore de trabalho" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "aceitar patches que alteram ficheiros fora da área de trabalho" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "aplicar o patch também (use com --stat/--summary/--check)" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "tentar integração com três pontos se um patch não se aplica com êxito" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "" +"construir um índice temporário baseado na informação incorporada do índice" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "os caminhos estão separados por caracteres NUL" + +#: apply.c:4956 +msgid "ensure at least <n> lines of context match" +msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "ação" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "detetar linhas novas ou modificadas que tenham espaços em branco" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "ignorar alterações de espaço em branco ao procurar contexto" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "aplicar o patch em reverso" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "não esperar nenhuma linha de contexto" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "permitir a sobreposição de excertos" + +#: 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 "ser verboso" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" +"tolerar deteções incorretas de falta de nova linha no final do ficheiro" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "não confiar na contagem de linhas no cabeçalho dos excertos" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "raiz" + +#: apply.c:4982 +msgid "prepend <root> to all filenames" +msgstr "preceder <root> a todos os nomes de ficheiro" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]" @@ -121,7 +746,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <cmd>] --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 "o especificador de caminho '%s' não corresponde a nenhum ficheiro" @@ -134,7 +759,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato do arquivo" -#: archive.c:430 builtin/log.c:1422 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "prefixo" @@ -142,11 +767,11 @@ msgstr "prefixo" msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: 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 "ficheiro" @@ -178,8 +803,8 @@ msgstr "compressão ótima" msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: 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 "repo" @@ -187,7 +812,7 @@ msgstr "repo" msgid "retrieve the archive from remote repository <repo>" msgstr "obter o arquivo a partir do repositório remoto <repo>" -#: 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 "comando" @@ -461,27 +1086,27 @@ msgstr "" "o seu homólogo remoto, pode usar \"git push -u\" para configurar\n" "o respetivo ramo a montante, ao mesmo tempo que publica." -#: branch.c:266 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nome de objeto inválido: '%s'." -#: branch.c:286 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nome de objeto ambíguo: '%s'." -#: branch.c:291 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Ponto no ramo inválido: '%s'." -#: branch.c:345 +#: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' foi já extraído em '%s'" -#: branch.c:364 +#: branch.c:363 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD da árvore de trabalho %s não está atualizada" @@ -496,7 +1121,7 @@ msgstr "'%s' não parece ser um ficheiro bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "cabeçalho não reconhecido: %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 "não foi possível abrir '%s'" @@ -505,9 +1130,9 @@ msgstr "não foi possível abrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "O repositório não possuí estes commits pré-requisitados:" -#: 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 "falha ao configurar percurso de revisões" @@ -547,7 +1172,7 @@ msgstr "rev-list terminou inesperadamente" msgid "ref '%s' is excluded by the rev-list options" msgstr "a referência '%s' é excluída pelas opções 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 "argumento não reconhecido: %s" @@ -570,8 +1195,8 @@ msgstr "index-pack terminou inesperadamente" msgid "invalid color value: %.*s" msgstr "valor de cor inválido: %.*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 "não foi possível analisar %s" @@ -581,6 +1206,17 @@ msgstr "não foi possível analisar %s" msgid "%s %s is not a commit!" msgstr "%s %s não é um 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 "" +"aviso: a mensagem de commit não conforma com UTF-8.\n" +"Pode querer emendá-lo depois de corrigir a mensagem ou definir a\n" +"variável de configuração i18n.commitencoding com a codificação que\n" +"o seu projeto utiliza.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "memória esgotada" @@ -667,7 +1303,7 @@ msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s" msgid "failed to expand user dir in: '%s'" msgstr "falha ao expandir diretório de utilizador em: '%s'" -#: config.c:849 config.c:860 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "nível de compressão zlib %d incorreto" @@ -711,22 +1347,66 @@ msgstr "não foi possível definir '%s' como '%s'" msgid "could not unset '%s'" msgstr "não foi possível reiniciar '%s'" +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "O remoto desligou após contacto inicial" + +#: connect.c:51 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"Não foi possível ler do repositório remoto.\n" +"\n" +"Certifica-se que tem os direitos de acesso corretos\n" +"e que o repositório existe." + #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 msgid "Checking connectivity" msgstr "A verificar conectividade" -#: connected.c:74 +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "Não foi possível executar 'git rev-list'" -#: connected.c:94 +#: connected.c:95 msgid "failed write to rev-list" msgstr "falha ao escrever para rev-list" -#: connected.c:101 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "falha ao fechar entrada padrão de rev-list" +#: convert.c:201 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"CRLF será substituído por LF em %s.\n" +"O final de linha original será mantido no ficheiro da sua árvore de trabalho." + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "CRLF será substituído por LF em %s." + +#: convert.c:211 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"LF será substituído por CRLF em %s.\n" +"O final de linha original será mantido no ficheiro da sua árvore de trabalho." + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "LF será substituído por CRLF em %s." + #: date.c:97 msgid "in the future" msgstr "no futuro" @@ -800,26 +1480,31 @@ msgstr[1] "há %lu anos" msgid "failed to read orderfile '%s'" msgstr "falha ao ler o ficheiro de comando '%s'" -#: diffcore-rename.c:540 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: diff.c:116 +#: diff.c:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "a opção '%s' requer um valor" + +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n" -#: diff.c:121 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parâmetro de dirstat desconhecido '%s'\n" -#: diff.c:225 +#: diff.c:283 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'" -#: diff.c:277 +#: diff.c:346 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -828,16 +1513,20 @@ msgstr "" "Erros encontrados na variável de configuração 'diff.dirstat':\n" "%s" -#: diff.c:3017 +#: diff.c:3087 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:3415 +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos" + +#: diff.c:3502 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um único especificador de caminho" -#: diff.c:3578 +#: diff.c:3665 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -846,61 +1535,247 @@ msgstr "" "Falha ao analisar parâmetro da opção --dirstat/-X:\n" "%s" -#: diff.c:3592 +#: diff.c:3679 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'" -#: dir.c:1823 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "" +"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros." + +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." +msgstr "" +"só foram encontradas cópias de caminhos modificados devido a demasiados " +"ficheiros." + +#: diff.c:4706 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"pode tentar definir a variável %s para, pelo menos, %d e repetir o comando." + +#: dir.c:1866 msgid "failed to get kernel name and information" msgstr "falha ao obter nome e informação do kernel" -#: dir.c:1942 +#: dir.c:1985 msgid "Untracked cache is disabled on this system or location." msgstr "A cache não controlada está desativada neste sistema ou localização." -#: gpg-interface.c:178 +#: fetch-pack.c:213 +#, fuzzy +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: esperava-se lista rasa" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF" + +#: fetch-pack.c:243 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" + +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc requer multi_ack_detailed" + +#: fetch-pack.c:381 +#, fuzzy, c-format +msgid "invalid shallow line: %s" +msgstr "linha rasa inválida: %s" + +#: fetch-pack.c:387 +#, fuzzy, c-format +msgid "invalid unshallow line: %s" +msgstr "linha para aprofundar inválida: %s" + +#: fetch-pack.c:389 +#, c-format +msgid "object not found: %s" +msgstr "objeto não encontrado: %s" + +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" +msgstr "erro no objeto: %s" + +#: fetch-pack.c:394 +#, fuzzy, c-format +msgid "no shallow found: %s" +msgstr "raso não encontrado: %s" + +#: fetch-pack.c:397 +#, fuzzy, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "esperava-se raso/aprofundar, obteve-se %s" + +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" +msgstr "obteve-se %s %d %s" + +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "commit inválido %s" + +#: fetch-pack.c:483 +msgid "giving up" +msgstr "desistência" + +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "concluído" + +#: fetch-pack.c:505 +#, c-format +msgid "got %s (%d) %s" +msgstr "obteve-se %s (%d) %s" + +#: fetch-pack.c:551 +#, c-format +msgid "Marking %s as complete" +msgstr "Marcado %s como completo" + +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" +msgstr "já se tem %s (%s)" + +#: 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 "erro de protocolo: cabeçalho de pacote incorreto" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: não é possível criar processo filho %s" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "%s falhou" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "" + +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "O servidor não suporta clientes rasos" + +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "O servidor suporta multi_ack_detailed" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "O servidor suporta no-done" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "O servidor suporta muilti_ack" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "O servidor suporta side-band-64k" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "O servidor suporta side-band" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "O servidor suporta allow-tip-sha1-in-want" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "O servidor suporta allow-reachable-sha1-in-want" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "O servidor suporta ofs-delta" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "A versão do servidor é %.*s" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "O servidor não suporta --shallow-since" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "O servidor não suporta --shallow-exclude" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "O servidor não suporta --deepen" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "nenhum commit em comum" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: falha ao obter." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "nenhuma cabeça remota correspondente" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg não assinou os dados" -#: gpg-interface.c:208 +#: gpg-interface.c:215 msgid "could not create temporary file" msgstr "não foi possível criar ficheiro temporário" -#: gpg-interface.c:210 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falha ao escrever assinatura destacada em '%s'" -#: grep.c:1792 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': não foi possível ler %s" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "falha ao invocar stat de '%s'" -#: grep.c:1820 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "'%s': leitura truncada" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "comandos do git disponível em '%s'" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos do git disponíveis noutras localizações em $PATH" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "Estes são comandos do Git comuns usados em diversas situações:" -#: help.c:309 +#: help.c:306 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -909,11 +1784,11 @@ msgstr "" "'%s' parece ser um comando do git, mas não é possível\n" "executá-lo. Talvez git-%s esteja danificado?" -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh não. Não há nenhum comando do Git disponível no sistema." -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -922,17 +1797,17 @@ msgstr "" "AVISO: Invocou um comando do Git designado '%s' que não existe.\n" "Continuando, assumindo que queria dizer '%s'" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automaticamente em %0.1f..." -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' não é um comando do git. Consulte 'git --help'." -#: help.c:404 help.c:470 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -946,11 +1821,37 @@ msgstr[1] "" "\n" "Queria dizer deste?" -#: 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" +"*** Por favor diga que é.\n" +"\n" +"Execute\n" +"\n" +" git config --global user.email \"eu@exemplo.com\"\n" +" git config --global user.name \"Meu Nome\"\n" +"\n" +"para definir a identidade predefinida da sua conta.\n" +"Omita --global para definir a identidade apenas neste repositório.\n" +"\n" + #: lockfile.c:152 #, c-format msgid "" @@ -979,8 +1880,8 @@ msgstr "Não é foi possível criar '%s.lock': %s" msgid "failed to read the cache" msgstr "falha ao ler a 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 "não foi possível escrever novo ficheiro de índice" @@ -1016,7 +1917,7 @@ msgstr ": talvez um conflito D/F?" msgid "refusing to lose untracked file at '%s'" msgstr "perda de ficheiro não controlado em '%s' recusada" -#: merge-recursive.c:796 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "não é possível ler o objeto %s: '%s'" @@ -1159,7 +2060,7 @@ msgstr "%s ignorado (integrado é igual ao existente)" msgid "Auto-merging %s" msgstr "A integrar automaticamente %s" -#: merge-recursive.c:1736 git-submodule.sh:919 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "submódulo" @@ -1225,6 +2126,22 @@ msgstr "Não foi possível analisar o objeto '%s'" msgid "Unable to write index." msgstr "Não é possível escrever no índice." +#: 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 "" +"Não concluíu a integração de notas anterior (%s existe).\n" +"Use 'git notes merge --commit' ou 'git notes merge --abort' para submeter/" +"abortar a integração anterior antes de começar uma nova integração de notas." + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "Não concluído a integração de integração de notas (%s presente)." + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" @@ -1282,7 +2199,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nome do objeto malformado '%s'" -#: path.c:798 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "Não foi possível dar permissão de escrita ao grupo a %s" @@ -1341,12 +2258,20 @@ msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: mágica de especificador de caminho não suportada por este comando: %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 "" +"cadeias de caracteres vazias como especificadores de caminho tornar-se-ão " +"inválidas nas próximas versões. Use . para corresponder a todos os caminhos" + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1354,15 +2279,11 @@ msgstr "" "Não há nada para excluir de acordo com o padrão :(excluir).\n" "Talvez se tenha esquecido de acrescentar ':/' ou '.' ?" -#: pretty.c:973 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "não foi possível analisar o formato de --pretty" -#: progress.c:235 -msgid "done" -msgstr "concluído" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1371,7 +2292,7 @@ msgstr "" "index.version definido, mas com valor inválido.\n" "A usar a versão %i" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1380,22 +2301,22 @@ msgstr "" "GIT_INDEX_VERSION definido, mas com valor inválido.\n" "A usar a versão %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 "Não foi possível abrir '%s' para escrita" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "não foi possível eliminar a referência %s: %s" -#: refs/files-backend.c:2537 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "não foi possível eliminar as referências: %s" -#: refs/files-backend.c:2546 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "não foi possível eliminar a referência %s" @@ -1524,12 +2445,12 @@ msgstr "a referência %s com nome danificado foi ignorada" msgid "ignoring broken ref %s" msgstr "a referência %s danificada foi ignorada" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "nome de objeto malformado %s" @@ -1660,37 +2581,37 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n" -#: revision.c:2132 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "o ramo atual parece estar danificado" -#: revision.c:2135 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "o ramo atual '%s' ainda não contém nenhum commit" -#: revision.c:2329 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent é incompatível com --bisect" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "falha ao abrir /dev/null" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) falhou" -#: send-pack.c:298 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "falha ao assinar o certificado de publicação" -#: send-pack.c:411 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "o recetor não suporta publicação com --signed" -#: send-pack.c:413 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -1698,15 +2619,23 @@ msgstr "" "certificado de publicação não enviado uma vez que o recetor não suporta " "publicação com --signed" -#: send-pack.c:425 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "o recetor não suporta publicação com --atomic" -#: send-pack.c:430 +#: send-pack.c:429 msgid "the receiving end does not support push options" msgstr "o recetor não suporta opções de publicação" -#: sequencer.c:174 +#: sequencer.c:171 +msgid "revert" +msgstr "reverter" + +#: 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>'" @@ -1714,7 +2643,7 @@ msgstr "" "depois de resolver os conflitos, marque os caminhos corrigidos\n" "com 'git add <caminhos>' ou 'git rm <caminhos>'" -#: 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" @@ -1724,232 +2653,257 @@ msgstr "" "com 'git add <caminhos>' ou 'git rm <caminhos>'\n" "e submeta o resultado com '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 "Não foi possível escrever em %s" +msgid "could not lock '%s'" +msgstr "não foi possível bloquear '%s'" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, c-format -msgid "Error wrapping up %s." -msgstr "Erro ao rematar %s." +msgid "could not write to '%s'" +msgstr "não foi possível escrever em '%s'" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "As suas alterações locais serão substituídas por cherry-pick." +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s" +msgstr "não foi possível escrever fim de linha em '%s'" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "As suas alterações locais serão substituídas por revert." +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "falha ao finalizar '%s'." -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Submeta ou esconda as suas alterações para continuar." +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "não foi possível ler '%s'" -#: sequencer.c:228 +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "as suas alterações locais serão substituídas ao %s." + +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "submeta ou esconda as suas alterações para continuar." + +#: sequencer.c:324 #, c-format msgid "%s: fast-forward" msgstr "%s: avanço rápido" #. 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: Não foi possível escrever novo ficheiro de índice" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" -msgstr "Não foi possível resolver o commit HEAD\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" +msgstr "não foi possível resolver o commit HEAD\n" + +#: sequencer.c:438 +msgid "unable to update cache tree\n" +msgstr "não foi possível atualizar a árvore de cache\n" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" -msgstr "Não foi possível atualizar a árvore de cache\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 "" +"tem alterações preparadas na árvore de trabalho\n" +"Se tenciona esmagar estas alterações no commit anterior, execute:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Se tenciona pô-las num novo commit, execute:\n" +"\n" +" git commit %s\n" +"\n" +"Em ambos os casos, quando estiver pronto, continue com:\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:393 +#: sequencer.c:567 #, c-format -msgid "Could not parse commit %s\n" -msgstr "Não foi possível analisar o commit %s\n" +msgid "could not parse commit %s\n" +msgstr "não foi possível analisar o commit %s\n" -#: sequencer.c:398 +#: sequencer.c:572 #, c-format -msgid "Could not parse parent commit %s\n" -msgstr "Não foi possível analisar o commit pai %s\n" +msgid "could not parse parent commit %s\n" +msgstr "não foi possível analisar o commit pai %s\n" -#: sequencer.c:463 -msgid "Your index file is unmerged." -msgstr "Ficheiro de índice não integrado." +#: sequencer.c:656 +msgid "your index file is unmerged." +msgstr "ficheiro de índice não integrado." -#: sequencer.c:482 +#: sequencer.c:675 #, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "O commit %s é uma integração mas não foi fornecida nenhuma opção -m." +msgid "commit %s is a merge but no -m option was given." +msgstr "o commit %s é uma integração mas não foi fornecida a opção -m." -#: sequencer.c:490 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "O commit %s não tem o pai %d" +msgid "commit %s does not have parent %d" +msgstr "o commit %s não tem o pai %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 "" -"A linha principal foi especificada mas o commit %s não é uma integração." +"a linha principal foi especificada mas o commit %s não é uma integração." -#. 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: não foi possível analisar o commit pai %s" -#: sequencer.c:511 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" -msgstr "Não é possível obter a mensagem de commit de %s" +msgid "cannot get commit message for %s" +msgstr "não é possível obter a mensagem de commit de %s" -#: sequencer.c:597 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "não foi possível reverter %s... %s" -#: sequencer.c:598 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "não foi possível aplicar %s... %s" -#: sequencer.c:633 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "o conjunto de commits especificado está vazio" -#: sequencer.c:641 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falha ao ler o índice" -#: sequencer.c:645 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falha ao atualizar o índice" -#: sequencer.c:705 -msgid "Cannot revert during another revert." -msgstr "Não é possível reverter durante outra reversão." - -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "Não é possível reverter durante um cherry-pick." - -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "Não é possível efetuar cherry-pick durante uma reversão." - -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "" -"Não é possível efetuar cherry-pick durante outro cherry-pick. durante um " -"cherry-pick." - -#: sequencer.c:732 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "Não foi possível analisar a linha %d." +msgid "invalid line %d: %.*s" +msgstr "linha %d inválida: %.*s" -#: sequencer.c:737 -msgid "No commits parsed." -msgstr "Nenhum commit analisado." +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "nenhum commit analisado." -#: sequencer.c:749 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "Não foi possível abrir %s" +msgid "could not read '%s'." +msgstr "não foi possível ler '%s'." -#: sequencer.c:753 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "Não foi possível ler %s." +msgid "unusable instruction sheet: '%s'" +msgstr "folha de instruções inutilizável: '%s'" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "Folha de instruções inutilizável: %s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "não é possível efetuar cherry-pick durante uma reversão." + +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "não é possível reverter durante um cherry-pick." -#: sequencer.c:790 +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" -msgstr "Chave inválida: %s" +msgid "invalid key: %s" +msgstr "chave inválida: %s" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "Valor inválido de %s: %s" +msgid "invalid value for %s: %s" +msgstr "valor inválido de %s: %s" -#: sequencer.c:803 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "Folha de opções malformada: %s" +msgid "malformed options sheet: '%s'" +msgstr "folha de opções malformada: '%s'" -#: sequencer.c:822 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "cherry-pick ou revert em curso" -#: sequencer.c:823 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" -#: sequencer.c:827 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "Não foi possível criar o diretório do sequenciador %s" +msgid "could not create sequencer directory '%s'" +msgstr "não foi possível criar o diretório do sequenciador '%s'" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "não foi possível bloquear HEAD" + +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "nenhum cherry-pick ou revert em curso" -#: sequencer.c:864 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "não é possível resolver HEAD" -#: sequencer.c:866 sequencer.c:900 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "não é possível abortar um ramo ainda não criado" -#: 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 "não é possível abrir %s" +msgid "cannot open '%s'" +msgstr "não é possível abrir '%s'" -#: sequencer.c:888 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "não é possível ler %s: %s" +msgid "cannot read '%s': %s" +msgstr "não é possível ler '%s': %s" -#: sequencer.c:889 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "fim de ficheiro inesperado" -#: sequencer.c:895 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido" -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "Não foi possível formatar %s." - -#: sequencer.c:1066 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: não é possível efetuar cherry-pick de %s" -#: sequencer.c:1069 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: revisão incorreta" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "Não é possível reverter como commit inicial" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "não é possível reverter como commit inicial" #: setup.c:160 #, c-format @@ -1984,11 +2938,6 @@ msgstr "" "Use '--' para separar caminhos de revisões, assim:\n" "'git <comando> [<revisão>...] -- [<ficheiro>...]'" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "falha ao ler %s" - #: setup.c:468 #, c-format msgid "Expected git repo version <= %d, found %d" @@ -2035,21 +2984,57 @@ msgstr "" "Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n" "O dono dos ficheiros tem de ter sempre permissões de leitura e escrita." -#: sha1_file.c:1046 +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "o caminho '%s' não existe" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"ainda não é suportada a funcionalidade que permite ter o repositório de " +"referência '%s' como uma extração ligada." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "o repositório de referência '%s' não é um repositório local." + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "o repositório de referência '%s' é raso" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "o repositório de referência '%s' está enxertado" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" -#: sha1_file.c:2434 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset antes do início do índice do pacote %s (índice corrompido?)" -#: sha1_file.c:2438 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "SHA1 curto %s é ambíguo" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "Os candidatos são:" + +#: 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" @@ -2099,7 +3084,7 @@ msgstr "Não foi possível remover o elemento %s de .gitmodules" msgid "staging updated .gitmodules failed" msgstr "falha ao preparar .gitmodules atualizado" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "não é permitido valores negativos em submodule.fetchJobs" @@ -2108,56 +3093,56 @@ msgstr "não é permitido valores negativos em submodule.fetchJobs" msgid "invalid value for %s" msgstr "valor inválido de %s" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "falha ao executar o comando 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 "valor desconhecido '%s' da chave '%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 "mais do que um %s" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "token terminador vazio no terminador '%.*s'" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "não foi possível ler o ficheiro de entrada '%s'" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "não foi possível ler da entrada padrão" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "não foi possível obter stat de %s" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "o ficheiro %s não é um ficheiro regular" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "o ficheiro %s não pode ser escrito pelo utilizador" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "não foi possível abrir ficheiro temporário" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "não foi possível mudar o nome do ficheiro temporário para %s" @@ -2172,7 +3157,7 @@ msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n" msgid "transport: invalid depth option '%s'" msgstr "transporte: opção de profundidade '%s' inválida" -#: transport.c:771 +#: transport.c:817 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -2181,7 +3166,7 @@ msgstr "" "Os seguintes caminhos de submódulo contêm alterações que\n" "não puderam ser encontradas a nenhum remoto:\n" -#: transport.c:775 +#: transport.c:821 #, c-format msgid "" "\n" @@ -2208,15 +3193,31 @@ msgstr "" "para publicá-las no remoto.\n" "\n" -#: transport.c:783 +#: transport.c:829 msgid "Aborting." msgstr "Abortado." -#: transport-helper.c:1041 +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "Não foi possível ler a referência %s" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "objeto árvore demasiado curto" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "modo na entrada de árvore malformado" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "nome de ficheiro vazio na entrada de árvore" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "ficheiro de árvore demasiado curto" + #: unpack-trees.c:64 #, c-format msgid "" @@ -2427,7 +3428,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 "" @@ -2438,7 +3439,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 "" @@ -2494,14 +3495,14 @@ msgstr "falha ao ler '%s'" msgid "could not open '%s' for reading and writing" msgstr "não foi possível abrir '%s' para leitura e escrita" -#: 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 "não foi possível abrir '%s' para escrita" -#: 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 "não foi possível abrir '%s' para leitura" @@ -2525,149 +3526,149 @@ msgstr "não foi possível escrever para %s" msgid "could not close %s" msgstr "não foi possível fechar %s" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "Caminhos não integrados:" -#: 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 " (use \"git reset %s <ficheiro>...\" para despreparar)" -#: 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 " (use \"git rm --cached <ficheiro>...\" para despreparar)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)" -#: 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 "" " (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como " "resolvido)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:198 wt-status.c:882 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "Alterações para serem submetidas:" -#: wt-status.c:216 wt-status.c:891 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "Alterações não preparadas para submeter:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (use \"git checkout -- <ficheiro>...\" para descartar alterações no " "diretório de trabalho)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (submeta ou descarte o conteúdo modificado ou não controlado nos " "submódulos)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "eliminado por ambos:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "adicionado por nós:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "eliminado por eles:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "adicionado por eles:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "eliminado por nós:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "adicionado por ambos:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "modificado por ambos:" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "novo ficheiro:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "copiado:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "eliminado:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "modificado:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "nome mudado:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "tipo alterado:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "desconhecido:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "não integrado:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "novos commits, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "conteúdo modificado, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "conteúdo não controlado, " -#: wt-status.c:756 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "Submódulos alterados mas não atualizados:" -#: wt-status.c:758 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "Alterações em submódulos para serem submetidas:" -#: wt-status.c:839 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2675,104 +3676,104 @@ msgstr "" "Não altere a linha acima.\n" "Tudo o que estiver abaixo será removido." -#: wt-status.c:950 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "Há caminhos não integrados." -#: wt-status.c:953 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (corrija os conflitos e execute \"git commit\")" -#: wt-status.c:955 +#: wt-status.c:1018 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (use \"git am --abort\" para abortar a integração)" -#: wt-status.c:960 +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar." -#: wt-status.c:963 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (use \"git commit\" para concluir a integração)" -#: wt-status.c:973 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "Sessão am em curso." -#: wt-status.c:976 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "O patch atual está vazio." -#: wt-status.c:980 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (corrija os conflitos e execute \"git am --continue\")" -#: wt-status.c:982 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (use \"git am --skip\" para ignorar este patch)" -#: wt-status.c:984 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (use \"git am --abort\" para restaurar o ramo original)" -#: wt-status.c:1109 +#: wt-status.c:1172 msgid "No commands done." msgstr "Nenhum comando concluído." -#: 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] "Último comando concluído (%d comando concluído):" msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):" -#: wt-status.c:1123 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " (veja mais no ficheiro %s)" -#: wt-status.c:1128 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "Nenhum comando por concluir." -#: 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] "Próximo comando a executar (%d comando restante):" msgstr[1] "Próximos comandos a executar (%d comandos restantes):" -#: wt-status.c:1139 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)" -#: wt-status.c:1152 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Está a realizar rebase do ramo '%s' sobre '%s'." -#: wt-status.c:1157 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "Está a rebasear neste momento." -#: wt-status.c:1171 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrija os conflitos e execute \"git rebase --continue\")" -#: wt-status.c:1173 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (use \"git rebase --skip\" para ignorar este patch)" -#: wt-status.c:1175 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (use \"git rebase --abort\" para restaurar o ramo original)" -#: wt-status.c:1181 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"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'." @@ -2780,126 +3781,126 @@ msgstr "" "Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' " "sobre '%s'." -#: wt-status.c:1190 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "Está a dividir um commit durante um rebase." -#: wt-status.c:1193 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Assim que o diretório de trabalho estiver limpo, execute \"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 "" "Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre " "'%s'." -#: wt-status.c:1202 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "Está a editar um commit durante um rebase." -#: wt-status.c:1205 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (use \"git commit --amend\" para emendar o commit atual)" -#: wt-status.c:1207 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (use \"git rebase --continue\" assim que estiver satisfeito com as " "alterações)" -#: wt-status.c:1217 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Está a realizar cherry-pick do commit %s." -#: wt-status.c:1222 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")" -#: wt-status.c:1225 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"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 "" " (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)" -#: wt-status.c:1236 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "Está a reverter o commit %s neste comento." -#: wt-status.c:1241 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrija dos conflitos e execute \"git revert --continue\")" -#: wt-status.c:1244 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git revert --continue\")" -#: wt-status.c:1246 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)" -#: wt-status.c:1257 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Está a bissetar, iniciado a partir do ramo '%s'." -#: wt-status.c:1261 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "Está a bissetar neste momento." -#: wt-status.c:1264 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (use \"git bisect reset\" para voltar ao ramo original)" -#: wt-status.c:1464 +#: wt-status.c:1524 msgid "On branch " msgstr "No ramo " -#: wt-status.c:1470 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "rebase interativo em curso; sobre " -#: wt-status.c:1472 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "rebase em curso; sobre " -#: wt-status.c:1477 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "HEAD destacada em " -#: wt-status.c:1479 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "HEAD destacada de " -#: wt-status.c:1482 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "Não se encontra em nenhum ramo neste momento." -#: wt-status.c:1500 +#: wt-status.c:1560 msgid "Initial commit" msgstr "Commit inicial" -#: wt-status.c:1514 +#: wt-status.c:1574 msgid "Untracked files" msgstr "Ficheiros não controlados" -#: wt-status.c:1516 +#: wt-status.c:1576 msgid "Ignored files" msgstr "Ficheiros ignorados" -#: wt-status.c:1520 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2911,32 +3912,32 @@ msgstr "" "cuidado de não se esquecer de adicionar novos ficheiros\n" "(consulte 'git help status')." -#: wt-status.c:1526 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "Ficheiros não controlados não listados%s" -#: wt-status.c:1528 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr " (use a opção -u para mostrar os ficheiros não controlados)" -#: wt-status.c:1534 +#: wt-status.c:1594 msgid "No changes" msgstr "Sem alterações" -#: 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 "" "nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git " "commit -a\")\n" -#: wt-status.c:1542 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "nenhuma alteração adicionada para submeter\n" -#: wt-status.c:1545 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2945,58 +3946,73 @@ msgstr "" "não foi adicionado nada para submeter, mas existem ficheiros não controlados " "(use \"git add\" para controlá-los)\n" -#: wt-status.c:1548 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "não foi adicionado nada para submeter, mas existem ficheiros não " "controlados\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 "" "não há nada para submeter (crie/copie ficheiros e use \"git add\" para " "controlá-los)\n" -#: wt-status.c:1554 wt-status.c:1559 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "não há nada para submeter\n" -#: wt-status.c:1557 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "não há nada para submeter (use -u para mostrar os ficheiros não " "controlados)\n" -#: wt-status.c:1561 +#: wt-status.c:1621 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "não há nada para submeter, árvore de trabalho limpa\n" -#: wt-status.c:1668 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "Commit inicial em " -#: wt-status.c:1672 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (nenhum ramo)" -#: wt-status.c:1701 +#: wt-status.c:1761 msgid "gone" msgstr "desaparecido" -#: wt-status.c:1703 wt-status.c:1711 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "atrás " -#: wt-status.c:1706 wt-status.c:1709 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "à frente " -#: 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 "não é possível efetuar %s: tem alterações não preparadas." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "além disso, o índice contém alterações não submetidas." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "não é possível efetuar %s: o índice contém alterações não submetidas." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "falha ao invocar unlink de '%s'" @@ -3005,276 +4021,261 @@ msgstr "falha ao invocar unlink de '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opções>] [--] <caminho>..." -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:71 builtin/commit.c:281 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "falha ao atualizar os ficheiros" -#: builtin/add.c:81 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "remover '%s'\n" -#: builtin/add.c:136 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "Alterações não preparadas depois de atualizar o índice:" -#: 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 "Não foi possível ler o índice" -#: builtin/add.c:207 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "Não foi possível abrir '%s' para escrita." -#: builtin/add.c:211 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "Não foi possível escrever patch" -#: builtin/add.c:214 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "falha ao editar patch" -#: builtin/add.c:217 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "Não foi possível obter stat de '%s'" -#: builtin/add.c:219 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "Patch vazio. Abortado." -#: builtin/add.c:224 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "Não foi possível aplicar '%s'" -#: builtin/add.c:234 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .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 "simular ação" -#: 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 "ser verboso" - -#: builtin/add.c:256 +#: builtin/add.c:269 msgid "interactive picking" msgstr "seleção interativa" -#: 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 "selecionar blocos interativamente" -#: builtin/add.c:258 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "editar o diff atual e aplicá-lo" -#: builtin/add.c:259 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "permitir adicionar ficheiros ignorados" -#: builtin/add.c:260 +#: builtin/add.c:273 msgid "update tracked files" msgstr "atualizar ficheiros controlados" -#: builtin/add.c:261 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "registar apenas o facto de que o caminho será adicionado mais tarde" -#: builtin/add.c:262 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "" "adicionar alterações de todos os ficheiros controlados ou não controlados" -#: builtin/add.c:265 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)" -#: builtin/add.c:267 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "não adicionar, apenas atualizar o índice" -#: builtin/add.c:268 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "ignorar ficheiros que não podem ser adicionados por causa de erros" -#: builtin/add.c:269 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "verificar quais os ficheiros ignorados na simulação" -#: 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 "substituir o bit executável dos ficheiros listados" -#: builtin/add.c:292 +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Use -f se deseja mesmo adicioná-los.\n" -#: builtin/add.c:300 +#: builtin/add.c:312 msgid "adding files failed" msgstr "falha ao adicionar ficheiros" -#: builtin/add.c:336 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A e -u são mutuamente incompatíveis" -#: builtin/add.c:343 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run" -#: builtin/add.c:352 +#: builtin/add.c:359 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x" -#: builtin/add.c:367 +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Não foi especificado nada, nada adicionado.\n" -#: builtin/add.c:368 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Queria dizer '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 "ficheiro de índice corrompido" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "Não foi possível escrever novo ficheiro de índice" - -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "não foi possível ler '%s'" - -#: builtin/am.c:426 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "não foi possível analisar o autor do script" -#: builtin/am.c:503 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' foi eliminado pelo hook applypatch-msg" -#: builtin/am.c:544 builtin/notes.c:301 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "Linha de entrada malformada: '%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 "Falha ao copiar notas de '%s' para '%s'" -#: builtin/am.c:607 +#: builtin/am.c:595 msgid "fseek failed" msgstr "falha ao invocar fseek" -#: builtin/am.c:787 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "não foi possível analisar o patch '%s'" -#: builtin/am.c:852 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez" -#: builtin/am.c:899 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "carimbo de data/hora inválido" -#: builtin/am.c:902 builtin/am.c:910 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "linha de Data inválida" -#: builtin/am.c:907 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "mudança de fuso horário inválida" -#: builtin/am.c:996 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "Falha ao detetar o formato do 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 "falha ao criar o diretório '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "Falha ao dividir patches." -#: builtin/am.c:1137 builtin/commit.c:366 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "não é possível escrever o ficheiro de índice" -#: builtin/am.c:1188 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Após resolver este problema, execute \"%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 "Se preferir ignorar este patch, execute \"%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 "" "Para restaurar o ramo original e interromper a aplicação dos patches, " "execute \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "O patch está vazio. Foi dividido incorretamente?" -#: builtin/am.c:1402 builtin/log.c:1543 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "linha de identidade inválida: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "não foi possível analisar o commit %s" -#: builtin/am.c:1602 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "O repositório não tem os blobs necessários para recorrer a integração com 3 " "pontos." -#: builtin/am.c:1604 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "A usar informação do índice para reconstruir uma árvore 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." @@ -3282,41 +4283,41 @@ msgstr "" "Editou o patch manualmente?\n" "Não é possível aplicá-lo aos blobs registados no índice." -#: builtin/am.c:1629 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "" "A recorrer a uma de base para aplicação de patches e integração com 3 " "pontos..." -#: builtin/am.c:1654 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "Falha ao integrar as alterações." -#: 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 falhou ao escrever uma árvore" -#: builtin/am.c:1686 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "a aplicar a um histórico vazio" -#: 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 "falha ao escrever objeto de 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 "não é possível continuar: %s não existe." -#: builtin/am.c:1751 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "não é possível entrar em modo interativo sem um entrada padrão conectada a " "um terminal." -#: builtin/am.c:1756 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "Corpo do commit:" @@ -3324,35 +4325,35 @@ msgstr "Corpo do commit:" #. 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 "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: " -#: builtin/am.c:1816 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice modificado: não é possível aplicar patches (modificado: %s)" -#: builtin/am.c:1853 builtin/am.c:1925 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "A aplicar: %.*s" -#: builtin/am.c:1869 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "Nenhuma alteração -- Já foi aplicado o patch." -#: builtin/am.c:1877 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "Falha ao aplicar o patch em %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 "A cópia do patch que falhou encontra-se em: %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" @@ -3362,7 +4363,7 @@ msgstr "" "Se não há nada por preparar, provavelmente essas mesmas alterações\n" "já foram introduzidas; pode querer ignorar este 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'?" @@ -3370,17 +4371,17 @@ msgstr "" "Ainda há caminhos não integrados no índice.\n" "Esqueceu-se de usar 'git add'?" -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Não foi possível analisar o objeto '%s'." -#: builtin/am.c:2095 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "falha ao limpar o índice" -#: 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" @@ -3388,155 +4389,134 @@ msgstr "" "Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n" "Não recuando a ORIG_HEAD" -#: builtin/am.c:2192 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido de --patch-format: %s" -#: builtin/am.c:2225 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<opções>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2226 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opções>] (--continue | --skip | --abort)" -#: builtin/am.c:2232 +#: builtin/am.c:2240 msgid "run interactively" msgstr "executar interativamente" -#: builtin/am.c:2234 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "opção histórica -- sem-ação" -#: builtin/am.c:2236 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "permitir recorrer a integração com 3 pontos se necessário" -#: 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 "silencioso" -#: builtin/am.c:2239 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/am.c:2242 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "recodificar em utf8 (predefinição)" -#: builtin/am.c:2244 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "passar a opção -k ao git-mailinfo" -#: builtin/am.c:2246 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "passar a opção -b ao git-mailinfo" -#: builtin/am.c:2248 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "passar a opção -m ao git-mailinfo" -#: builtin/am.c:2250 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox" -#: builtin/am.c:2253 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr" -#: builtin/am.c:2256 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "retirar todo o conteúdo antes da linha de tesoura" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "ação" - -#: 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 "transmitir ao git-apply" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "raiz" - -#: 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 "caminho" - -#: 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 "formato" -#: builtin/am.c:2282 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "formato de apresentação de patches" -#: builtin/am.c:2288 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "substituir a mensagem de erro quando a aplicação do patch falha" -#: builtin/am.c:2290 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "continuar a aplicar os patches depois de resolver os conflitos" -#: builtin/am.c:2293 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "sinónimo de --continue" -#: builtin/am.c:2296 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "ignorar o patch atual" -#: builtin/am.c:2299 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "restaurar o ramo original e abortar a operação de patch." -#: builtin/am.c:2303 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "mentir sobre a data de commit" -#: builtin/am.c:2305 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "usar a data e hora atual como data de autor" -#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "id-chave" -#: builtin/am.c:2308 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "assinar os commits com GPG" -#: builtin/am.c:2311 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(uso interno de 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." @@ -3544,17 +4524,17 @@ msgstr "" "A opção -b/--binary há muito que é ignorada e será\n" "futuramente removida. Por favor não a use." -#: builtin/am.c:2333 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "falha ao ler o índice" -#: builtin/am.c:2348 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox." -#: builtin/am.c:2372 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3563,498 +4543,14 @@ msgstr "" "Diretório abandonado %s encontrado.\n" "Use \"git am --abort\" para o remover." -#: builtin/am.c:2378 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "A operação de resolução não está em curso, não retomando." -#: builtin/apply.c:122 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<opções>] [<patch>...]" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "opção de espaço em branco não reconhecida '%s'" - -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "opção de ignorar espaço em branco não reconhecida '%s'" - -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "Não é possível preparar a regexp de carimbo de data/hora %s" - -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec retornou %d para a entra: %s" - -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d" - -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha " -"%d" - -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é " -"inconsistente" - -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" -"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é " -"inconsistente" - -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d" - -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recontagem: linha inesperada: %.*s" - -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragmento de patch sem cabeçalho na linha %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] "" -"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " -"%d componente do caminho (linha %d)" -msgstr[1] "" -"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " -"%d componentes de caminho (linha %d)" - -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "o novo ficheiro depende de conteúdos antigos" - -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "o ficheiro eliminado ainda tem conteúdos" - -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" -msgstr "patch corrompido na linha %d" - -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "o novo ficheiro %s depende de conteúdos antigos" - -#: builtin/apply.c:1812 -#, c-format -msgid "deleted file %s still has contents" -msgstr "o ficheiro eliminado %s ainda tem conteúdos" - -#: builtin/apply.c:1815 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado" - -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "patch binário corrompido na linha %d: %.*s" - -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "patch binário não reconhecido na linha %d" - -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "patch incompreensível na linha %d" - -#: builtin/apply.c:2244 -#, c-format -msgid "unable to read symlink %s" -msgstr "não é possível ler a ligação simbólica %s" - -#: builtin/apply.c:2248 -#, c-format -msgid "unable to open or read %s" -msgstr "não é possível abrir ou ler %s" - -#: builtin/apply.c:2901 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "início de linha inválido: '%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] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)." -msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)." - -#: builtin/apply.c:3032 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d" - -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"ao procura por:\n" -"%.*s" - -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "falta de dados do patch binário '%s'" - -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "o patch binário não foi aplicado corretamente a '%s'" - -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, " -"obteve-se %s)" - -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "falha ao aplicar o patch: %s:%ld" - -#: builtin/apply.c:3314 -#, c-format -msgid "cannot checkout %s" -msgstr "não é possível extrair %s" - -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "a ler '%s' indicado por uma ligação simbólica" - -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "o caminho %s foi eliminado ou mudou de nome" - -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: não existe no índice" - -#: 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: não tem correspondência no índice" - -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "patch de remoção deixa conteúdos no ficheiro" - -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s: tipo errado" - -#: builtin/apply.c:3671 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s é do tipo %o, esperado %o" - -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" -msgstr "caminho inválido '%s'" - -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: já existe no índice" - -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: já existe no diretório de trabalho" - -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)" - -#: builtin/apply.c:3907 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s" - -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica" - -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: patch não se aplica com sucesso" - -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "A verificar o 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 "falha ao invocar make_cache_entry em '%s'" - -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "não é possível remover %s do índice" - -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "patch corrompido no submódulo %s" - -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "não é possível obter estado do novo ficheiro criado '%s'" - -#: builtin/apply.c:4224 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "" -"não é possível criar armazenamento de segurança do ficheiro recém-criado %s" - -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "não é possível adicionar %s à cache" - -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "a fechar o ficheiro '%s'" - -#: builtin/apply.c:4313 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "não é possível escrever o ficheiro '%s' com o modo %o" - -#: builtin/apply.c:4403 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "Patch %s aplicado com sucesso." - -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "erro interno" - -#: builtin/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "A aplicar patch %%s com %d rejeição..." -msgstr[1] "A aplicar patch %%s com %d rejeições..." - -#: builtin/apply.c:4424 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" - -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "não é possível abrir %s: %s" - -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "Excerto nº%d aplicado com sucesso." - -#: builtin/apply.c:4448 -#, c-format -msgid "Rejected hunk #%d." -msgstr "Excerto nº%d rejeitado." - -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." -msgstr "Patch '%s' ignorado." - -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "entrada não reconhecida" - -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "não foi possível ler o ficheiro de índice" - -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "--3way fora de um repositório" - -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "--index fora de um repositório" - -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "--cached fora de um repositório" - -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "não é possível abrir o patch '%s'" - -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "%d erro de espaço em branco reprimido" -msgstr[1] "%d erros de espaço em branco reprimidos" - -#: 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 linha adiciona erros de espaço em branco." -msgstr[1] "%d linhas adicionam erros de espaço em branco." - -#: builtin/apply.c:4800 -msgid "don't apply changes matching the given path" -msgstr "não aplicar alterações que correspondam ao caminho fornecido" - -#: builtin/apply.c:4803 -msgid "apply changes matching the given path" -msgstr "aplicar alterações que correspondam ao caminho fornecido" - -#: builtin/apply.c:4806 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional" - -#: builtin/apply.c:4809 -msgid "ignore additions made by the patch" -msgstr "ignorar adições feitas pelo patch" - -#: builtin/apply.c:4811 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada" - -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "mostrar número de linhas adicionadas e removidas em notação decimal" - -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" - -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" - -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "garantir que o patch pode ser aplicado ao índice atual" - -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "aplicar um patch sem tocar na árvore de trabalho" - -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "aceitar patches que alteram ficheiros fora da área de trabalho" - -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "aplicar o patch também (use com --stat/--summary/--check)" - -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "tentar integração com três pontos se um patch não se aplica com êxito" - -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" -msgstr "" -"construir um índice temporário baseado na informação incorporada do índice" - -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" -msgstr "os caminhos estão separados por caracteres NUL" - -#: builtin/apply.c:4836 -msgid "ensure at least <n> lines of context match" -msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" - -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "detetar linhas novas ou modificadas que tenham espaços em branco" - -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" - -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "aplicar o patch em reverso" - -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "não esperar nenhuma linha de contexto" - -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" - -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "permitir a sobreposição de excertos" - -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "" -"tolerar deteções incorretas de falta de nova linha no final do ficheiro" - -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "não confiar na contagem de linhas no cabeçalho dos excertos" - -#: builtin/apply.c:4862 -msgid "prepend <root> to all filenames" -msgstr "preceder <root> a todos os nomes de ficheiro" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -4114,114 +4610,166 @@ msgstr "<rev-opções> estão documentadas em git-rev-list(1)" msgid "Blaming lines" msgstr "Linhas de culpa" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "" "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "Mostrar estatísticas de custo de atividade" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "Forçar informação de progresso" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "Mostrar a pontuação das entradas de culpa" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "Mostrar números de linha originais (Predefinição: desativado)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "Mostrar em formato próprio para ser consumo por uma máquina" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar em formato de porcelana com informações de commit por linha" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "Ignorar as diferenças de espaço em branco" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "" +"Usar um heurística experimental baseada em indentação para melhorar diffs" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "" +"Usar uma heurística experimental baseada em linhas brancas para melhorar " +"diffs" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "Despender ciclos extra para encontrar uma melhor correspondência" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "Usar o conteúdo do <ficheiro> como imagem final" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "pontuação" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "Localizar linhas copiadas dentro e entre ficheiros" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "Localizar linhas movidas dentro e entre ficheiros" -#: 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 "Processar apenas o intervalo de linhas n,m, a cantar de 1" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"--progress não pode ser usado com --incremental ou formatos de porcelana" + #. 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 "há 4 anos e 11 meses atrás" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents e --reverse não se misturam bem." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "não é possível usar --contents com nome de objeto commit final" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse e --first-parent juntos requer que se especifique o último commit" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "o caminho %s não existe em %s" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "não é possível ler o blob %s do caminho %s" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "o ficheiro %s só tem %lu linha" +msgstr[1] "o ficheiro %s só tem %lu linhas" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]" @@ -4471,6 +5019,10 @@ msgstr "a montante" msgid "change the upstream info" msgstr "alterar a informação do ramo a montante" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "Remover a informação do ramo a montante" + #: builtin/branch.c:661 msgid "use colored output" msgstr "usar saída colorida" @@ -4543,8 +5095,8 @@ msgstr "chave" msgid "field name to sort on" msgstr "nome do campo pelo qual ordernar" -#: 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 "objeto" @@ -4557,7 +5109,7 @@ msgstr "imprimir apenas os ramos do objeto" msgid "Failed to resolve HEAD as a valid ref." msgstr "Falha ao resolver HEAD numa referência válida." -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD não encontrada em refs/heads!" @@ -4670,65 +5222,81 @@ msgstr "É necessário um repositório para criar um bundle." msgid "Need a repository to unbundle." msgstr "É preciso um repositório para desempacotar." -#: builtin/cat-file.c:443 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<type>|--textconv) <object>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<tipo>|--textconv) <objeto>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>" -#: 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 "<tipo> pode ser um de: blob, tree, commit, tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "mostrar tipo do objeto" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "mostrar tamanho do objeto" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "sair com retorno zero quando não houver erros" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "mostrar conteúdo do objeto com impressão bonita" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "executar textconv no conteúdo de objetos blob" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto" + +#: 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 "usar um caminho específico para --textconv/--filters" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "carregar a saída 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 "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir ligações simbólica no interior da árvore (usado com --batch ou --" "batch-check)" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos os objetos com --batch ou --batch-check" @@ -4748,7 +5316,7 @@ msgstr "apresentar todos os atributos definidos no ficheiro" msgid "use .gitattributes only from the index" msgstr "usar .gitattributes apenas a partir do índice" -#: 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 "ler os nomes dos ficheiros da entrada padrão" @@ -4756,7 +5324,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão" msgid "terminate input and output records by a NUL character" msgstr "terminar registos da entrada e da saída com um carácter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "suprimir informação de progresso" @@ -4848,9 +5416,9 @@ msgid "write the content to temporary files" msgstr "escrever o conteúdo em ficheiros temporários" #: 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 "cadeia" @@ -4922,54 +5490,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "o caminho '%s' não foi integrado" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "primeiro deve resolver o índice atual" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Não é possível efetuar reflog de '%s': %s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD está agora em" -#: builtin/checkout.c:668 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "não foi possível atualizar HEAD" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "Repor ramo '%s'\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "Já em '%s'\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Mudou para e repôs o ramo '%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 "Mudou para o novo ramo '%s'\n" -#: builtin/checkout.c:683 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "Mudou para o ramo '%s'\n" -#: builtin/checkout.c:734 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " ... e mais %d.\n" -#: builtin/checkout.c:740 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4990,7 +5558,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" @@ -5017,151 +5585,151 @@ msgstr[1] "" " git branch <nome-do-novo-ramo> %s\n" "\n" -#: builtin/checkout.c:795 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "erro interno durante o curso de revisões" -#: builtin/checkout.c:799 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "A posição anterior de HEAD era" -#: builtin/checkout.c:826 builtin/checkout.c:1065 +#: builtin/checkout.c:825 builtin/checkout.c:1064 msgid "You are on a branch yet to be born" msgstr "Está num ramo ainda não criado" -#: builtin/checkout.c:971 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "esperava-se apenas uma referência, %d fornecidas." -#: builtin/checkout.c:1011 builtin/worktree.c:214 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "referência inválida: %s" -#: builtin/checkout.c:1040 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "a referência não é uma árvore: %s" -#: builtin/checkout.c:1079 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "não podem ser usados caminhos ao mudar de ramo" -#: 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' não pode ser usado ao mudar de ramo" -#: 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' não pode ser usado com '%s'" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Não é possível mudar de ramo para '%s', visto que não é um 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 "ramo" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "criar reflog do novo ramo" -#: builtin/checkout.c:1144 builtin/worktree.c:328 +#: builtin/checkout.c:1143 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "definir a informação do ramo a montante do novo ramo" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "novo-ramo" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "novo ramo sem pai" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "extrair a nossa versão dos ficheiros não integrados" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "extrair a versão deles dos ficheiros não integrados" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "forçar extração (descartar modificações locais)" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "realizar uma integração com 3 pontos com o novo ramo" -#: builtin/checkout.c:1154 builtin/merge.c:231 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "atualizar ficheiros ignorados (predefinição)" -#: 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 "estilo" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "estilo de conflito (merge ou diff3)" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "não restringir especificadores de caminho a entradas esparsas" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout <no-such-branch>'" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "" "não verificar se outra árvore de trabalho contém a referência fornecida" -#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117 -#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "forçar informação de progresso" -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B e --orphan são mutuamente exclusivos" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "--track requer um nome dum ramo" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1253 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "especificação de caminho inválida" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5171,12 +5739,12 @@ msgstr "" "tempo.\n" "Pretendia extrair '%s' o qual não pode ser resolvido como 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ão aceita um caminho como argumento '%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." @@ -5328,8 +5896,8 @@ msgstr "limpeza interativa" msgid "remove whole directories" msgstr "remover diretórios inteiros" -#: 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 "padrão" @@ -5369,112 +5937,130 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opções>] [--] <repo> [<dir>]" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "não criar uma extração" -#: 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 "criar um repositório nu" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "criar um repositório espelhado (implica repositório nu)" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "para clonar de um repositório local" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "não usar ligações fixas, copiar sempre" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "configurar como repositório partilhado" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "inicializar submódulos no clone" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "número de submódulos clonados em paralelo" -#: builtin/clone.c:80 builtin/init-db.c:473 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "diretório-modelo" -#: 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 "diretório que contém os modelos usados" -#: 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 "repositório de referência" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "usar --reference apenas para clonar" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nome" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extrair <ramo> em vez da HEAD do remoto" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "caminho para git-upload-pack no remoto" -#: 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 "profundidade" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "criar um clone raso com essa profundidade" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "hora" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "criar um clone raso desde uma data específica" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "revisão" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "aprofundar o histórico de um clone raso ao excluir uma revisão" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "clonar apenas um ramo, HEAD ou --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "qualquer submódulo clonado será raso" -#: 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 "separar o repositório git da árvore de trabalho" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "chave=valor" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "definir configuração dentro do novo repositório" -#: 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 "usar apenas endereços 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 "usar apenas endereços 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" @@ -5482,59 +6068,42 @@ msgstr "" "Não foi possível adivinhar o nome do diretório.\n" "Especifique um diretório na linha de comandos" -#: builtin/clone.c:307 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"ainda não é suportada a funcionalidade que permite ter o repositório de " -"referência '%s' como uma extração ligada." +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: Não foi possível adicionar sobressalente de '%s': %s\n" -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "o repositório de referência '%s' não é um repositório local." - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "o repositório de referência '%s' é raso" - -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "o repositório de referência '%s' está enxertado" - -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "falha ao abrir '%s'" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe e não é um diretório" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "falha ao invocar stat de %s\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "falha ao criar a ligação '%s'" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "falha ao copiar o ficheiro para '%s'" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "concluído.\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" @@ -5544,124 +6113,140 @@ msgstr "" "Pode inspecionar o que foi extraído com 'git status'\n" "e repetir a extração com '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 "Ramo remoto %s não encontrado para clonar." -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "o remoto não enviou todos os objetos necessários" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "não foi possível atualizar %s" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "a HEAD remota referencia uma referência inexistente, não é possível " "extrair.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "não foi possível extrair a árvore de trabalho" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "não é possível reempacotar para limpar" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "" "não é possível invocar unlink sobre o ficheiro sobressalente temporário" -#: builtin/clone.c:863 builtin/receive-pack.c:1855 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "Deve especificar um repositório para clonar." -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "as opções --bare e --origin %s são incompatíveis." -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare e --separate-git-dir são incompatíveis." -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "o repositório '%s' não existe" -#: 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 "profundidade %s não é um número positivo" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "o caminho de destino '%s' já existe e não é um diretório vazio." -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "a árvore de trabalho '%s' já existe." -#: 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 "não foi possível criar os diretórios superiores de '%s'" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "não foi possível criar o diretório de árvore de trabalho '%s'" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "A clonar no repositório nu '%s'...\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "A clonar em '%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ão é compatível com ambos --reference e --reference-if-" +"able" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1000 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since é ignorado em clones locais; use file:// ." + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "--shallow-exclude é ignorado em clones locais; use file:// ." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "o repositório de origem é raso, --local ignorado" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local ignorado" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "Não sei como clonar %s" -#: builtin/clone.c:1058 builtin/clone.c:1066 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "Parece foi clonado um repositório vazio." @@ -5800,66 +6385,66 @@ msgstr "" "Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n" "dos restantes commits.\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "falha ao descompactar o objeto árvore HEAD" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "não foi possível criar índice temporário" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "falha ao adicionar interativamente" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "não é possível atualizar o índice temporário" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Falha ao atualizar a árvore 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 "não é possível escrever o ficheiro new_index" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "não é possível fazer um commit parcial durante uma integração." -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "não é possível fazer um commit parcial durante um cherry-pick." -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "não é possível ler o índice" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "não é possível escrever ficheiro de índice temporário" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "o commit '%s' não tem cabeçalho de autor" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "o commit '%s' tem a linha de autor malformada" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "parâmetro --author malformado" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "formato de data inválido: %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" @@ -5867,38 +6452,38 @@ msgstr "" "não foi possível selecionar um carácter de comentário que\n" "não estivesse já a ser usado na mensagem de commit atual" -#: 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 "não foi possível consultar o 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 "(a ler mensagem de log da entrada padrão)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "não foi possível ler o log da entrada padrão" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "não é possível ler o ficheiro de log '%s'" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "não foi possível ler SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "não foi possível ler MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "não foi possível escrever o modelo de commit" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5913,7 +6498,7 @@ msgstr "" "\t%s\n" "e tente de novo.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5928,7 +6513,7 @@ msgstr "" "\t%s\n" "e tente outra vez.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5938,7 +6523,7 @@ msgstr "" "Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5949,149 +6534,153 @@ msgstr "" "Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n" "Uma mensagem vazia aborta o commit.\n" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Não é possível ler o índice" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "Erro ao construir árvores" -#: 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 "Indique a mensagem usando as opções -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ão é do tipo 'Nome <email>' e não corresponde a um autor " "existente" -#: 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 "Modo inválido de ficheiros não controlados '%s'" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long e -z são incompatíveis" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "Não faz sentido usar --reset-author e --author ao mesmo tempo" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "Não há nada para emendar." -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "Integração em curso -- não é possível emendar." -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Cherry-pick em curso -- não é possível emendar." -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "As opções --squash e --fixup não podem ser usadas juntas" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado." -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "A opção -m não pode ser combinada com -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 só pode ser usado com -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 "" "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado." -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "As opções --include/--only não fazem sentido sem indicar caminhos." -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "Inteligente... a emendar o último commit com o índice sujo." -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..." -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo de limpeza inválido %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Indicar caminhos com -a não faz sentido." -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "mostrar status de forma concisa" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "mostrar informação do ramo" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "versão" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "saída inteligível por máquina" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "apresentar status em formato longo (predefinição)" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "terminar entradas com 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 "modo" -#: 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 "" "mostrar ficheiros não controlados, modo é opcional: all, normal, no. " "(Predefinição: all)" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "mostrar ficheiros ignorados" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "quando" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6099,200 +6688,200 @@ msgstr "" "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. " "(Predefinição: all)" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "listar ficheiros não controlados em colunas" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "não foi possível consultar o commit recém-criado" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "não foi possível analisar o commit recém-criado" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "HEAD destacada" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (commit-raiz)" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "suprimir o resumo depois de submeter com sucesso" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "mostrar diff no modelo da mensagem de commit" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Opções de mensagem de commit" -#: builtin/commit.c:1596 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "ler mensagem de um ficheiro" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "author" msgstr "autor" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "substituir autor do commit" -#: builtin/commit.c:1598 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "data" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "substituir data do commit" -#: 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 "mensagem" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "commit message" msgstr "mensagem de commit" -#: 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 "reutilizar e editar a mensagem de um commit especificado" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "reutilizar a mensagem de um commit especificado" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensagem com formato autosquash para corrigir o commit especificado" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar mensagem com formato autosquash para esmagar o commit especificado" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "agora sou eu o autor do commit (usado com 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 "adicionar Signed-off-by:" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "usar ficheiro de modelo especificado" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "forçar edição do commit" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "predefinição" -#: 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 "como retirar espaços e #comentários da mensagem" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "incluir status no modelo da mensagem de commit" -#: 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 "assinar o commit com GPG" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Opções de conteúdo do commit" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "submeter todos os ficheiros alterados" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "adicionar ficheiros especificados ao índice para submeter" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "adicionar ficheiros interativamente" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "adicionar alterações interativamente" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "submeter somente os ficheiros especificados" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignorar pre-commit e commit-msg hooks" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "mostrar o que seria submetido" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "emendar o commit anterior" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "ignorar post-rewrite hook" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "aceitar o registo duma alteração vazia" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "aceitar o registo duma alteração com uma mensagem vazia" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "não foi possível analisar o commit HEAD" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Ficheiro MERGE_HEAD corrompido (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "não foi possível ler MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "não foi possível ler a mensagem de commit: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "A abortar o commit; não editou a mensagem.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\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" @@ -6461,11 +7050,20 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "não é possível criar o ficheiro de configuração %s" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"não é possível substituir múltiplos valores por um único valor\n" +"\tUse uma regexp, --add ou --replace-all para alterar %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 "imprimir dimensões em formato inteligível por humanos" @@ -6585,7 +7183,7 @@ msgstr "considerar as <n> tags mais recentes (predefinição: 10)" msgid "only consider tags matching <pattern>" msgstr "apenas considerar tags que correspondam ao <padrão>" -#: 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 "mostrar objetos de commit abreviados em recurso" @@ -6621,21 +7219,21 @@ msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica" msgid "invalid option: %s" msgstr "opção inválida: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "Não é um repositório git" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "objeto inválido '%s' fornecido." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "mais do que dois blobs fornecidos: '%s'" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "objeto sem tratamento '%s' fornecido." @@ -6709,162 +7307,166 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opções>]" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "obter de todos os remotos" -#: 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 "acrescentar a .git/FETCH_HEAD em vez de substituir" -#: 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 "caminho para o comando upload pack no remoto" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "forçar a substituição do ramo local" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "obter de múltiplos remotos" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "obter todas as tags e objetos associados" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "não obter todas as tags (--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "número de submódulos obtidos em paralelo" -#: 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 "" "eliminar os ramos de monitorização remotos que já não existem no remoto" -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "controlar a obtenção recursiva de submódulos" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "manter o pacote transferido" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "permitir a atualização da referência HEAD" -#: builtin/fetch.c:119 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "aprofundar o histórico de um clone raso" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "aprofundar o histórico de repositório raso com base na data" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "converter num repositório completo" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "dir" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "preceder isto ao caminho do submódulo" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "modo recursivo por omissão" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "aceitar referência que atualizem .git/shallow" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "mapa de referências" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "especificar mapa de referências" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "Referência remota HEAD não encontrada" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "a configuração fetch.ouput contém o valor inválido %s" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "objeto %s não encontrado" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[atualizado]" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[rejeitado]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "não é possível obter no ramo atual" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[tag atualizada]" -#: 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 "não é possível atualizar a referência local" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[nova tag]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[novo ramo]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[nova referência]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "atualização forçada" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "sem avanço-rápido" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s não enviou todos os objetos necessários\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 rejeitado, porque as raízes rasas não podem ser atualizadas" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6873,55 +7475,55 @@ msgstr "" "algumas referências locais não puderam ser atualizadas; tente executar\n" " 'git remote prune %s' para remover algum ramo antigo em conflito" -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s ficará suspenso)" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s ficou suspenso)" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(nenhum)" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "O valor \"%2$s\" da opção \"%1$s\" não é válido em %3$s" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opção \"%s\" ignorada em %s\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "Não sei como obter de %s" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "A obter 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 "Não foi possível obter de %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." @@ -6929,32 +7531,40 @@ msgstr "" "Nenhum repositório remoto especificado. Especifique um URL ou\n" "o nome remoto a partir do qual as novas revisões devem ser obtidas." -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "Deve especificar um nome para a tag." -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "Não é suportada profundidade negativa em --deepen" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen e --depth são mutuamente exclusivos" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "--depth e --unshallow não podem ser usados juntos" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "usar --unshallow num repositório completo não faz sentido" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all não leva um repositório como argumento" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all não faz sentido com especificadores de referência" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "O remoto ou grupo remoto não existe: %s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Não faz sentido obter um grupo e especificar uma referência" @@ -6965,23 +7575,23 @@ msgstr "" "git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file " "<ficheiro>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "povoar o registo com, no máximo, <n> entradas do shortlog" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "alias de --log (obsoleto)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "usar <texto> no início da mensagem" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "ficheiro a ler" @@ -7100,7 +7710,7 @@ msgstr "mostrar progresso" msgid "show verbose names for reachable objects" msgstr "mostrar nomes verbosos de objetos inalcançáveis" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "A verificar objetos" @@ -7195,229 +7805,224 @@ msgstr "grep: falha ao criar thread: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "o número de threads especificado em %2$s é inválido (%1$d)" -#: 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 "não foi possível ler a árvore (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "não foi possível efetuar grep de objetos do tipo %s" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "a opção '%c' espera um valor numérico" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "não é possível abrir '%s'" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "procurar no índice em vez de procurar na árvore de trabalho" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "procurar em conteúdos não geridos pelo git" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "procurar em ficheiros controlados e não controlados" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "ignorar ficheiros especificados via '.gitignore'" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "mostrar linhas não correspondidas" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "não diferenciar maiúsculas de minúsculas" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "corresponder padrões apenas a palavras" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "processar ficheiros binários como texto" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "ignorar ficheiros binários" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "processar ficheiros binários com filtros textconv" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "descer no máximo até <profundidade>" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "usar expressões regulares estendidas do POSIX" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "usar expressões regulares básicas do POSIX (predefinição)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "interpretar padrões como cadeias de caracteres fixas" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "usar expressões regulares compatíveis com Perl" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "mostrar números de linha" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "não mostrar nomes de ficheiro" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "mostrar nomes de ficheiro" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "mostrar nomes de ficheiro relativamente ao diretório superior" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "sinónimo de --files-with-matches" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "mostrar apenas nomes de ficheiro sem correspondência" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "imprimir NUL depois dos nomes de ficheiro" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "mostrar o número de correspondências em vez das linha correspondidas" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "realçar correspondências" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "" "imprimir uma linha em branco entre correspondências de diferentes ficheiros" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "" "mostrar só uma vez o nome do ficheiro acima das correspondências dentro do " "mesmo ficheiro" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> linhas de contexto antes e depois das correspondências" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "mostrar <n> linhas de contexto antes das correspondências" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "mostrar <n> linhas de contexto depois das correspondências" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "usar <n> threads de trabalho" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "atalho para -C NUM" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "mostrar uma linha com o nome da função antes das correspondências" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "mostrar a função circundante" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "ler padrões do ficheiro" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "procurar <padrão>" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "combinar padrões especificados com -e" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "indicar padrão encontrado no valor de saída, mas não imprimir" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "" "mostrar apenas correspondências de ficheiro que tenham todos os padrões" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "mostrar árvore de analise da expressões grep" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "paginador" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "mostrar ficheiros com correspondências no paginador" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir invocar grep(1) (ignorado nesta compilação)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "nenhum padrão fornecido." -#: 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 "número de threads especificado inválido (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager só funciona na árvore de trabalho" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked não podem ser usados com --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 não podem ser usados em revisões." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard não podem ser usados em conteúdos não controlados." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "--cached e árvores foram fornecidos simultaneamente." @@ -7433,85 +8038,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 "tipo" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "tipo do objeto" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "escrever o objeto na base de dados de objetos" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "ler o objeto da entrada padrão" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "guardar o ficheiro tal como está, sem filtros" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "obter hash de lixo aleatório para criar objetos corrompidos para depurar o " "Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "processar o ficheiro como se este fosse do caminho indicado" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "imprimir todos os comandos disponíveis" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "excluir guias" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "imprimir lista de guias úteis" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "mostrar página do manual" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "mostrar o manual no navegador web" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "mostrar página 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] [<comando>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "formato de ajuda não reconhecido '%s'" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Falha ao iniciar emacsclient." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Falha ao analisar a versão do emacsclient." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "a versão do emacsclient '%d' é demasiado antiga (< 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 "falha ao executar '%s'" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7520,7 +8129,7 @@ msgstr "" "'%s': caminho para visualizador de manual não suportado.\n" "Considere usar 'man.<ferramenta>.cmd'." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7529,300 +8138,304 @@ msgstr "" "'%s': comando de visualizador de manual suportado.\n" "Considere usar 'man.<ferramenta>.path'." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de manual desconhecido." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "nenhum visualizador de manual atendeu o pedido" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "nenhum visualizador de info atendeu o pedido" -#: builtin/help.c:401 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "Definir atributos por caminho" -#: builtin/help.c:402 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "Diário Git com mais ou menos 20 Comandos" -#: builtin/help.c:403 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "Um Glossário do Git" -#: builtin/help.c:404 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "" "Especificar ficheiros não controlados para serem intencionalmente ignorados" -#: builtin/help.c:405 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "Definir propriedades de submódulos" -#: builtin/help.c:406 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "Especificar revisões e intervalos do Git" -#: builtin/help.c:407 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)" -#: builtin/help.c:408 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git" -#: builtin/help.c:420 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "Os guias comuns do Git:\n" -#: builtin/help.c:441 builtin/help.c:458 -#, c-format -msgid "usage: %s%s" -msgstr "utilização: %s%s" - -#: builtin/help.c:474 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "'git %s' é um alias de '%s'" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "utilização: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "não foi possível abrir %s" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "incompatibilidade de tipo de objeto em %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "o objeto esperado %s não foi recebido" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, obtido %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] "não é possível preencher %d byte" msgstr[1] "não é possível preencher %d bytes" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "fim de ficheiro (EOF) prematuro" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "erro de leitura da entrada" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "foram usados mais bytes dos que estavam disponíveis" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "pacote demasiado grande para a definição atual 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 "o pacote excede o tamanho máximo permitido" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "não foi possível criar '%s'" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "não é possível abrir o ficheiro de pacote '%s'" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "a assinatura do pacote não corresponde" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versão de pacote %<PRIu32> não suportada" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "a descompactação retornou %d" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "delta de objeto base com capacidade excedida no valor de offset" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "offset da base delta está fora do limite" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "objeto de tipo desconhecido %d" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "não é possível invocar pread sobre o ficheiro de pacote" -#: 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] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte" msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "inconsistência de descompactação grave" -#: 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 "COLISÃO DE SHA1 COM %s ENCONTRADA!" -#: 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 "não foi possível ler %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "não é possível ler o objeto existente %s" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "objeto blob inválido %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "inválido %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "Erro no objeto" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nem todos os objetos filhos de %s são alcançáveis" -#: 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 "falha ao aplicar delta" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "A receber objetos" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "A indexar objetos" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "pacote corrompido (SHA1 não corresponde)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "não é possível invocar fstat sobre o ficheiro de pacote" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "pacote com lixo no final" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "extrema confusão em parse_pack_objects()" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "A resolver deltas" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "não foi possível criar thread: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "extrema confusão" -#: 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] "concluído com %d objeto local" msgstr[1] "concluído com %d objetos locais" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)" -#: 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] "pacote com %d delta não resolvido" msgstr[1] "pacote com %d deltas não resolvidos" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "não é possível compactar objeto acrescentado (%d)" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s corrompido" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "erro ao fechar ficheiro de pacote" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "não é possível escrever o ficheiro de conservação '%s'" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "não é possível fechar o ficheiro de conservação '%s' escrito" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "não é possível guardar ficheiro de pacote" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "não é possível guardar o ficheiro índice" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorreto" -#: 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 "sem suporte de threads, %s ignorado" @@ -7862,95 +8475,95 @@ msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'" msgid "bad %s" msgstr "%s incorreto" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin não pode ser usado sem --stdin" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "--verify sem nome do ficheiro de pacote indicado" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "não é possível invocar stat sobre '%s'" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "não é possível invocar stat sobre o modelo '%s'" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "não é possível abrir (opendir) '%s'" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "não é possível ler (readlink) '%s'" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "não é possível criar a ligação simbólica '%s' '%s'" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "não é possível copiar '%s' para '%s'" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "modelo %s ignorado" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "modelos não encontrados em %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "modelos não copiados de '%s': %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s já existe" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "não foi possível processar o tipo de ficheiro %d" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "não foi possível mover %s para %s" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s já existe" + +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Repositório Git partilhado e existente reinicializado em %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 "Repositório Git existem reinicializado em %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 "Repositório Git vazio e partilhado inicializado em %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 "Repositório Git vazio inicializado em %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>]" @@ -7958,26 +8571,26 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--" "shared[=<permissões>]] [<diretório>]" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "permissões" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especificar que o repositório git será partilhado por vários utilizadores" -#: 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 "não é possível criar o diretório %s" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "não é possível mudar para o diretório %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-" @@ -7986,7 +8599,7 @@ msgstr "" "%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-" "dir=<diretório>)" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "Não é possível aceder à árvore de trabalho '%s'" @@ -8097,37 +8710,34 @@ msgstr "Não é um intervalo." msgid "Cover letter needs email format" msgstr "A carta de apresentação precisa de um formato de e-mail" -#: builtin/log.c:1064 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to incorreto: %s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "Dois diretórios de saída?" -#: 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 desconhecido %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 "Falha ao resolver '%s' numa referência válida." -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "Não foi possível encontrar a base exata de integração." -#: 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" @@ -8138,213 +8748,217 @@ msgstr "" "use branch --set-upstream-to para seguir um ramo remoto.\n" "Ou pode especificar o commit base com --base=<base-commit-id> manualmente." -#: builtin/log.c:1283 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "Falha ao procurar base exata de integração" -#: builtin/log.c:1294 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "o commit base deve ser o antecessor da lista de revisões" -#: builtin/log.c:1298 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "o commit base não deve fazer parte da lista de revisões" -#: builtin/log.c:1347 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "não é possível obter o id do patch" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "usar [PATCH n/m] mesmo com um único patch" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "usar [PATCH] mesmo com múltiplos patches" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "imprimir patches para a saída padrão" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "gerar uma carta de apresentação" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "" "usar uma sequência de números simples para denominar os ficheiros gerados" -#: 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 "usar <sfx> em vez de '.patch'" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "começar a numerar os patches em <n> em vez de 1" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "marcar a série como a n-ésima reiteração" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "Usar [RFC PATCH] em vez de [PATCH]" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "usar [<prefixo>] em vez de [PATCH]" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "guardar os ficheiros resultantes em <dir>" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "não tirar/inserir [PATCH]" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "não gerar diffs binários" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "preencher o cabeçalho From com hash de zeros" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "não incluir um patch que coincida com um commit a montante" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostrar no formato de patch em vez de no formato por omissão (patch + stat)" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "Mensagem" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "cabeçalho" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "adicionar cabeçalho de 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 "adicionar cabeçalho To:" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "adicionar cabeçalho Cc:" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "ident" msgstr "identidade" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "definir o endereço From como <identidade> (ou como identidade do committer " "se não indicado)" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "id-mensagem" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "usar o primeiro email para responder a <id-mensagem>" -#: 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 "anexar o patch" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "incorporar o patch" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "assinatura" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "adicionar uma assinatura" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "adicionar informação pré-requisito da árvore à série de patches" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "adicionar uma assinatura de um ficheiro" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "não imprimir os nomes dos ficheiros de patch" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n e -k são mutuamente exclusivos." -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix e -k são mutuamente exclusivos." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos." -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only não faz sentido" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status não faz sentido" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check não faz sentido" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "saída padrão, ou diretório, qual deles?" -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "Não foi possível criar o diretório '%s'" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "não é possível ler o ficheiro de assinatura '%s'" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "Falha ao criar os ficheiros de saída" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ramo-a-montante> [<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" @@ -8352,103 +8966,107 @@ msgstr "" "O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> " "manualmente.\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opções>] [<ficheiro>...]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "identificar o estado do ficheiro com tags" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "usar letras minúsculas para ficheiros 'assumido não alterado' ('assume " "unchanged')" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "mostrar ficheiros em cache na saída (predefinição)" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "mostrar ficheiros eliminados na saída" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "mostrar ficheiros modificados na saída" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "mostrar outros ficheiros na saída" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "mostrar ficheiros ignorados na saída" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "mostrar nome de objetos com conteúdo preparado, na saída" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "" "mostrar ficheiros no sistema de ficheiros que precisam de ser removidos" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "mostrar nomes de diretórios 'other' (outro)" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "mostrar finais de linha dos ficheiros" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "não mostrar diretórios vazios" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "mostrar ficheiros não integrados na saída" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "mostrar informação de resolver-desfazer" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "ignorar ficheiros que correspondam ao padrão" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "ler padrões de exclusão do <ficheiro>" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "ler padrões de exclusão por diretório do <ficheiro>" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "incluir as exclusões standard do git" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "mostrar os caminhos relativamente ao diretório superior do projeto" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "percorrer submódulos recursivamente" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "se um <ficheiro> não estiver no índice, tratar como erro" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "árvore-etc" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "mostrar dados de depuração" @@ -8566,33 +9184,33 @@ msgstr "Estratégias disponíveis:" msgid "Available custom strategies are:" msgstr "Estratégias personalizadas disponíveis:" -#: 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 "não apresentar um diffstat ao fim da integração" -#: 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 "mostrar um diffstat ao fim da integração" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(sinónimo 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 "" "adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da " "integração" -#: 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 "criar um único commit em vez de realizar uma integração" -#: 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 "realizar um commit se a integração for bem sucedida (predefinição)" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "editar a mensagem antes de submeter" @@ -8600,28 +9218,28 @@ msgstr "editar a mensagem antes de submeter" msgid "allow fast-forward (default)" msgstr "permitir avanço rápido (predefinição)" -#: 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 "abortar se não é possível efetuar avanço rápido" -#: 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 "verificar se o commit tem uma assinatura GPG válida" -#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "estratégia" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "estratégia de integração a usar" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "opção=valor" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "opções da estratégia de integração selecionada" @@ -8633,7 +9251,7 @@ msgstr "mensagem de commit (de integração não suscetível a avanço rápido)" msgid "abort the current in-progress merge" msgstr "abortar integração em curso" -#: builtin/merge.c:227 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "permitir integração de históricos não relacionados" @@ -8859,55 +9477,55 @@ msgstr "integração de históricos não relacionados recusada" msgid "Already up-to-date." msgstr "Já está atualizado." -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "A atualizar %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "A tentar integração mesmo trivial no interior do índice...\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "Não.\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "Já está atualizado. Sim!" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "Não é possível avançar rapidamente, a abortar." -#: 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 "A recuar a árvore ao seu estado original...\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "A tentar a estratégia de integração %s...\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Falha ao integrar com a estratégia %s.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "A usar %s para preparar resolução manual.\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8934,23 +9552,23 @@ msgstr "git merge-base --is-ancestor <commit> <commit>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <referência> [<commit>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "mostrar todos os antecessores" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "encontrar antecessores de uma única integração com n pontos" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "listar revisões não alcançáveis a partir de outras" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "o primeiro é antecessor do segundo?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "" "descobrir onde foi que o <commit> divergiu usando o reflog da <referência>" @@ -8995,6 +9613,37 @@ msgstr "não alertar sobre conflitos" msgid "set labels for file1/orig-file/file2" msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "opção desconhecido %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "não foi possível analisar o objeto '%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] "não é possível processar mais do que %d base. Ignorar %s." +msgstr[1] "não é possível processar mais do que %d bases. Ignorar %s." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "não se pode processar outra coisa senão integração de duas cabeças." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "não foi possível resolver a referência %s" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "A integrar %s com %s\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9104,43 +9753,43 @@ msgstr "A mudar de nome de %s para %s\n" msgid "renaming '%s' failed" msgstr "falha ao mudar o nome de '%s'" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opções>] <commit>..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opções>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opções>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "imprimir apenas nomes (sem SHA-1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "usar apenas tags para designar commits" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "usar apenas referência que correspondam ao <padrão>" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "listar todos os commits alcançáveis a partir de todas as referências" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "ler da entrada padrão" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nomes 'indefinidos' (predefinição)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags na entrada (uso interno)" @@ -9273,8 +9922,8 @@ msgid "failed to finish 'show' for object '%s'" msgstr "falha ao concluir o comando 'show' sobre o objeto '%s'" #: builtin/notes.c:194 -msgid "Please supply the note contents using either -m or -F option" -msgstr "Forneça o conteúdo da nota usando a opção -m ou -F" +msgid "please supply the note contents using either -m or -F option" +msgstr "forneça o conteúdo da nota usando a opção -m ou -F" #: builtin/notes.c:203 msgid "unable to write note object" @@ -9282,8 +9931,8 @@ msgstr "não é possível escrever o objeto de nota" #: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" -msgstr "O conteúdo da nota foi guardado em %s" +msgid "the note contents have been left in %s" +msgstr "o conteúdo da nota foi colocado em %s" #: builtin/notes.c:233 builtin/tag.c:439 #, c-format @@ -9295,52 +9944,76 @@ msgstr "não é possível ler '%s'" msgid "could not open or read '%s'" msgstr "não foi possível abrir ou ler '%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 "falha ao resolver '%s' como uma referência válida." + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." -msgstr "Falha ao ler o objeto '%s'." +msgid "failed to read object '%s'." +msgstr "falha ao ler o objeto '%s'." #: builtin/notes.c:261 #, c-format -msgid "Cannot read note data from non-blob object '%s'." -msgstr "Não é possível ler os dados da nota de um objeto não-blob '%s'." +msgid "cannot read note data from non-blob object '%s'." +msgstr "não é possível ler os dados da nota de um objeto não-blob '%s'." + +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "linha de entrada malformada: '%s'." + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "falha ao copiar notas de '%s' para '%s'" -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#. 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 "foi recusado efetuar %s de notas em %s (fora de refs/notes/)" + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "demasiados parâmetros" -#: 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 "A nota do objeto %s não foi encontrada." +msgid "no note found for object %s." +msgstr "nenhuma nota encontrada para o objeto %s." -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "conteúdo da nota sob a forma de cadeia de caracteres" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "conteúdo da nota de um ficheiro" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "reutilizar e editar o objeto de nota especificado" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "reutilizar o objeto de nota especificado" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "permitir guardar uma nota vazia" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "substituir notas existentes" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9349,29 +10022,29 @@ msgstr "" "Não é possível adicionar notas. Notas do objeto %s encontradas. Use '-f' " "para substituí-las." -#: 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 "A substituir as notas existentes do objeto %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 "A remover a nota do objeto %s\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "ler objetos da entrada padrão" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "carregar configuração de reescrita do <comando> (implica --stdin)" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "parâmetros insuficientes" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9380,12 +10053,12 @@ msgstr "" "Não é possível copiar notas. Notas do objeto %s encontradas. Use '-f' para " "substituí-las." -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "Não existem notas no objeto de origem %s. Não é possível copiar." +msgid "missing notes on source object %s. Cannot copy." +msgstr "faltam notas no objeto de origem %s. Não é possível copiar." -#: builtin/notes.c:587 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9394,20 +10067,52 @@ msgstr "" "As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n" "Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "falha ao eliminar a referência NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "falha ao eliminar a referência NOTES_MERGE_REF" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "falha ao remover a árvore de trabalho de 'git notes merge'" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "falha ao ler referência NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "não foi possível encontrar o commit de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "não foi possível analisar o commit de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "falha ao resolver NOTES_MERGE_REF" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "falha ao finalizar integração de notas" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "estratégia de integração de notas %s desconhecida" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "Opções gerais" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "Opções de integração" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9415,46 +10120,46 @@ msgstr "" "resolver conflitos nas notas usando a estratégia indicada (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "A submeter notas não integradas" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "concluir integração de notas, submetendo notas não integradas" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "A abortar resolução de integração das notas" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "abortar integração das notas" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "não é possível misturar --commit, --abort ou -s/--strategy" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" -msgstr "Tem de especificar uma referência de notas para integrar" +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" +msgstr "tem de especificar uma referência de notas para integrar" -#: builtin/notes.c:821 +#: builtin/notes.c:823 #, c-format -msgid "Unknown -s/--strategy: %s" +msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconhecida: %s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "Uma integração das notas em %s já está em curso em %s" +msgid "a notes merge into %s is already in-progress at %s" +msgstr "uma integração das notas em %s já está em curso em %s" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" -msgstr "Falha ao guardar ligação à referência de notas atual (%s)" +msgid "failed to store link to current notes ref (%s)" +msgstr "falha ao guardar ligação à referência de notas atual (%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 " @@ -9465,234 +10170,230 @@ msgstr "" "submeta o resultado com 'git notes merge --commit' ou aborte a integração " "com 'git notes merge --abort'.\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "O objeto %s não tem nenhuma nota\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "não considerar como erro a remoção de uma nota não existente" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "ler nome dos objetos da entrada padrão" -#: 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 "não remover, mostrar apenas" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "reportar notas podadas" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "usar notas de <notes-ref>" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" -msgstr "Subcomando desconhecido: %s" +msgid "unknown subcommand: %s" +msgstr "subcomando desconhecido: %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 [<opções>...] [< <lista-referências> | < <lista-" "objetos>]" -#: 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 [<opções>...] <nome-base> [< <lista-referências> | < <lista-" "objetos>]" -#: 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 "erro ao compactar (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "a desativar escrita de mapa de bits, os pacotes são divididos devido a pack." "packSizeLimit" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "A escrever objetos" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "a desativar escrita de mapa de bits, visto que alguns objetos não estão a " "ser compactados" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "A comprimir objetos" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "versão de índice %s não suportada" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "versão de índice '%s' incorreta" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "não mostrar medidor de progresso" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "mostrar medidor de progresso" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "versão[,offset]" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "" "escrever o ficheiro de índice do pacote na versão de formato especificada" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "tamanho máximo de cada ficheiro de pacote gerado" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "ignorar objetos compactados" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "limitar a janela de compactação por objetos" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "" "limitar a janela de compactação por memória em adição ao limite por objetos" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "reutilizar deltas existentes" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "usar threads ao procurar pela melhor correspondência delta" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "não criar um pacote vazio" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "ler argumentos de revisão da entrada padrão" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "restringir-se aos objetos que ainda não foram compactados" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "incluir objetos alcançáveis a partir de qualquer referência" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "incluir objetos referenciados por entradas do reflog" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "incluir objetos referenciados pelo índice" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "gerar pacote para a saída padrão" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refiram objetos a compactar" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "manter objetos inalcançáveis" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "empacotar objetos soltos inalcançáveis" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "hora" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "descompactar objetos inalcançáveis mais recentes que <hora>" -#: builtin/pack-objects.c:2704 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "criar pacotes finos" -#: builtin/pack-objects.c:2706 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "criar pacotes adequados para obter em repositórios pouco profundos" -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "ignorar pacotes que tenham um ficheiro .keep" -#: builtin/pack-objects.c:2710 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "nível de compactação do pacote" -#: builtin/pack-objects.c:2712 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "não esconder commits introduzidos por enxertos" -#: builtin/pack-objects.c:2714 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar um índice de mapa de bits se disponível, para acelerar a contagem de " "objetos" -#: builtin/pack-objects.c:2716 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "A contar objetos" @@ -9732,53 +10433,45 @@ msgstr "expirar objetos mais antigos que <hora>" msgid "cannot prune in a precious-objects repo" msgstr "não é possível limpar num repositório de objetos-preciosos" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Valor inválido de %s: %s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "Opções relativas a integração" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar alterações por rebase em vez de integrar" -#: builtin/pull.c:147 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "permitir avanço rápido" -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "empilhar/desempilhar automaticamente antes de depois de rebase" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "Opções relacionadas com obtenção de objetos" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "número de submódulos puxados em paralelo" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido de pull.ff: %s" -#: builtin/pull.c:379 git-sh-setup.sh:226 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "Não é possível puxar com rebase: tem alterações não preparadas." - -#: builtin/pull.c:385 git-sh-setup.sh:252 -msgid "Additionally, your index contains uncommitted changes." -msgstr "Além disso, o índice contém alterações não submetidas." - -#: builtin/pull.c:387 git-sh-setup.sh:245 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"Não é possível puxar com rebase: o índice contém alterações não submetidas." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9786,14 +10479,14 @@ msgstr "" "Não há nenhum candidato com o qual realizar rebase de entre as referências " "que se acabaram de obter." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Não há nenhum candidato com o qual integrar de entre as referências que se " "acabaram obter." -#: 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." @@ -9801,7 +10494,7 @@ msgstr "" "Geralmente, significa que forneceu um especificador de referência\n" "com um carácter universal (wildcard) que não corresponde a nenhum remoto." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9812,44 +10505,44 @@ msgstr "" "Uma vez que este não é o remoto configurado por predefinição\n" "do ramo atual, deve especificar um ramo na linha de comandos." -#: 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 "Não se encontra em nenhum ramo de momento." -#: 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 "Especifique o ramo sobre o qual pretende realizar rebase." -#: 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 "Especifique o ramo com o qual pretende integrar." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "Consulte git-pull(1) para obter mais detalhes." -#: 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 "<remoto>" -#: 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 "<ramo>" -#: 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 "O ramo atual não segue nenhum ramo." -#: 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 "" "Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo " "com:" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9858,21 +10551,29 @@ msgstr "" "A configuração indica para integrar com a referência '%s'\n" "do remoto, mas aquela referência não foi obtida." -#: builtin/pull.c:820 +#: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" msgstr "ignorado --verify-signatures para rebase" -#: builtin/pull.c:867 +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "a opção --[no-]autostash só é válida com --rebase." -#: builtin/pull.c:875 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "" "A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao " "índice." -#: builtin/pull.c:903 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "puxar com rebase" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "submeta ou esconda-as." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9883,7 +10584,7 @@ msgstr "" "a avançar a árvore de trabalho a partir do\n" "commit %s." -#: builtin/pull.c:908 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9900,11 +10601,11 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:923 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia." -#: builtin/pull.c:927 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "Não é possível efetuar rebase sobre múltiplos ramos." @@ -10280,15 +10981,65 @@ msgstr "ignorar a aplicação do filtro de extração esparsa" msgid "debug unpack-trees" msgstr "depurar unpack-trees" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1843 +#: builtin/receive-pack.c:793 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set 'receive.denyCurrentBranch' configuration variable to\n" +"'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" +"Por predefinição, atualizar o ramo atual num repositório não-nu\n" +"é proibido, porque tornará o índice e a árvore de trabalho inconsistentes\n" +"com o que publicou e requererá 'git reset --hard' para igualar a\n" +"árvore de trabalho à HEAD.\n" +"\n" +"Pode definir a variável configuração 'receive.denyCurrentBranch'\n" +"como 'ignore' ou 'warn' no repositório remoto para permitir publicar\n" +"para o ramo atual dele; no entanto, não é recomendando a menos que\n" +"consiga de outra forma atualizar a árvore de trabalho dele para\n" +"refletir o que publicou.\n" +"\n" +"Para suprimir esta mensagem e manter o comportamento predefinido, defina a " +"variável de configuração 'receive.denyCurrentBranch' como '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 "" +"Por predefinição, eliminar o ramo atual é proibido, porque o próximo\n" +"'git clone' não resultará em nenhum ficheiro extraído, causando confusão.\n" +"\n" +"Pode definir a variável de configuração 'receive.denyDeleteCurrent' como\n" +"'warn' ou 'ignore' no repositório remoto para permitir eliminar o\n" +"ramo atual, com ou sem uma mensagem de aviso.\n" +"\n" +"Para suprimir esta mensagem, pode definí-la como 'refuse'." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "silencioso" -#: builtin/receive-pack.c:1857 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "Deve especificar um diretório." @@ -10621,7 +11372,7 @@ msgstr "* remoto %s" msgid " Fetch URL: %s" msgstr " Obter do URL: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(nenhum URL)" @@ -10658,7 +11409,7 @@ msgid_plural " Remote branches:%s" msgstr[0] " Ramo remoto:%s" msgstr[1] " Ramos remotos:%s" -#: builtin/remote.c:1179 builtin/remote.c:1206 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr " (estado não consultado)" @@ -10672,138 +11423,143 @@ msgstr[1] " Ramos locais configurados para 'git pull':" msgid " Local refs will be mirrored by 'git push'" msgstr " Referências locais serão refletidas (mirror) por '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] " Referência local configurada para 'git push'%s:" msgstr[1] " Referências locais configuradas para 'git push'%s:" -#: builtin/remote.c:1224 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto" -#: builtin/remote.c:1226 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "eliminar refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1241 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "Não é possível determinar o remoto HEAD" -#: builtin/remote.c:1243 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:" -#: builtin/remote.c:1253 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "Não foi possível eliminar %s" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "Referência inválida: %s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "Não foi possível configurar %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %s ficará suspenso!" -#: builtin/remote.c:1282 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %s ficou suspenso!" -#: builtin/remote.c:1292 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "A eliminar %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 " * [eliminaria] %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [eliminado] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "eliminar remotos depois de obter" -#: 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 "Remoto inexistente '%s'" -#: builtin/remote.c:1436 +#: builtin/remote.c:1435 msgid "add branch" msgstr "adicionar ramo" -#: builtin/remote.c:1443 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "nenhum remoto especificado" -#: builtin/remote.c:1460 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de publicação em vez de URLs utilizados para obter" -#: builtin/remote.c:1462 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "retornar todos os URLs" -#: builtin/remote.c:1490 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "o remoto '%s' não tem nenhum URL configurado" -#: builtin/remote.c:1516 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "manipular URLs de publicação" -#: builtin/remote.c:1518 +#: builtin/remote.c:1517 msgid "add URL" msgstr "adicionar URL" -#: builtin/remote.c:1520 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "eliminar URLs" -#: builtin/remote.c:1527 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add --delete não faz sentido" -#: builtin/remote.c:1568 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Padrão de URL antigo inválido: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "URL não encontrado: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "Não é possível remover todos os URLs de não publicação" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; deve ser colocado antes de um subcomando" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Subcomando desconhecido: %s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<opções>]" @@ -10993,8 +11749,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] <árvore-etc> [--] <caminhos>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<árvore-etc>] [--] <caminhos>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -11113,27 +11869,27 @@ msgstr "Não foi possível repor o ficheiro índice para a revisão '%s'." msgid "Could not write new index file." msgstr "Não foi possível escrever novo ficheiro de índice." -#: builtin/rev-list.c:362 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list não suporta apresentação de notas" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "conservar '--' passado como argumento" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "parar de analisar depois do primeiro argumento que não seja uma opção" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "mostrar em formato fixo e longo" -#: 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" @@ -11225,7 +11981,7 @@ msgstr "manter commits redundantes e vazios" msgid "revert failed" msgstr "falha ao reverter" -#: builtin/revert.c:207 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "falha ao efetuar cherry-pick" @@ -11397,71 +12153,126 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]" -#: builtin/show-branch.c: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] "ignorar %s; não é possível processar mais do que %d referência" +msgstr[1] "ingorar %s; não é possível processar mais do que %d referências" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "nenhuma referência corresponde com %s" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "mostrar os ramos de monitorização remotos e os ramos locais" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "mostrar os ramos de monitorização remotos" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "colorir '*!+-' correspondendo ao ramo" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "mostrar mais <n> commits depois do antecessor comum" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "sinónimo de more=-1" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "suprimir a cadeias de caracteres de nomes" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "incluir o ramo atual" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "designar commits pelos seus nomes de objeto" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "mostrar possíveis bases de integração" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "mostrar referências inalcançáveis a partir de outras referências" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "mostrar commits em ordem topológica" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "mostrar apenas commits não presentes no primeiro ramo" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "mostrar integrações alcançáveis a partir duma única ponta" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "" "ordenar topologicamente, mantendo a ordenação por data sempre que possível" -#: 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 "mostrar as <n> entradas de ref-log mais recente a partir da base" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog é incompatível com --all, --remotes, --independent or --merge-base" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "nenhum ramo fornecido e HEAD não é válida" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "a opção --reflog precisa do nome de um ramo" + +#: 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] "apenas %d entrada podem ser mostradas neste momento." +msgstr[1] "apenas %d entradas podem ser mostradas neste momento." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "referência inexistente %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] "não é possível processar mais do que %d revisão." +msgstr[1] "não é possível processar mais do que %d revisões." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "'%s' não é uma referência válida." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "não é possível encontrar o commit %s (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11525,12 +12336,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "preceder cada linha com um carácter de comentário e um espaço" -#: 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 "Referência inexistente: %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 "Esperava-se um nome completo de uma referência, obteve-se %s" @@ -11540,75 +12351,94 @@ msgstr "Esperava-se um nome completo de uma referência, obteve-se %s" msgid "cannot strip one component off url '%s'" msgstr "não é possível tirar um componente do URL '%s'" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 -#: builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 +#: builtin/submodule--helper.c:590 msgid "alternative anchor for relative paths" msgstr "âncora alternativa para caminhos relativos" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" -#: 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 "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules" -#: builtin/submodule--helper.c:364 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falha ao registar o URL do caminho de submódulo '%s'" -#: builtin/submodule--helper.c:368 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registado com caminho '%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 "aviso: modo de atualização do comando sugerido para o submódulo '%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 "Falha ao registar o modo de atualização do caminho de submódulo '%s'" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "Suprimir a saída ao inicializar um submódulo" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<caminho>]" -#: builtin/submodule--helper.c:430 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <caminho>" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules" -#: 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 "o submódulo '%s' não pode adicionar sobressalente: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "O valor '%s' de submodule.alternateErrorStrategy não é reconhecido" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "O valor '%s' de submodule.alternateLocation não é reconhecido" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "sítio para aonde o novo submódulo será clonado" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "nome do novo submódulo" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "url donde clonar o submódulos" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "profundidade de clones rasos" -#: builtin/submodule--helper.c:504 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "forçar progresso da clonagem" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11616,99 +12446,99 @@ msgstr "" "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference " "<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>" -#: 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 "não foi possível criar o diretório '%s'" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "falha ao clonar '%s' no caminho de submódulo '%s'" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "não é possível abrir o ficheiro '%s'" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "não é possível fechar o ficheiro %s" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "não foi possível obter o diretório do submódulo de '%s'" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Caminho de submódulo '%s' não inicializado" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "Pretendia usar 'update --init'?" -#: builtin/submodule--helper.c:641 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "A ignorar submódulo %s não integrado" -#: builtin/submodule--helper.c:662 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "A ignorar submódulo '%s'" -#: builtin/submodule--helper.c:792 +#: builtin/submodule--helper.c:913 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falha ao clonar '%s'. Nova tentativa agendada" -#: builtin/submodule--helper.c:803 +#: builtin/submodule--helper.c:924 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falha ao clonar '%s' pela segunda vez, abortado" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "caminho para a árvore de trabalho" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "caminho para a árvore de trabalho, atravessando limites de submódulos " "aninhados" -#: builtin/submodule--helper.c:831 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "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 "criar um clone raso, truncado ao número especificado de revisões" -#: builtin/submodule--helper.c:838 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "trabalhos em paralelo" -#: builtin/submodule--helper.c:840 +#: builtin/submodule--helper.c:961 msgid "whether the initial clone should follow the shallow recommendation" msgstr "se o clone inicial deve seguir a recomendação rasa" -#: builtin/submodule--helper.c:841 +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "não imprimir progresso da clonagem" -#: 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=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "valor incorreto no parâmetro update" -#: builtin/submodule--helper.c:927 +#: builtin/submodule--helper.c:1050 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -11717,11 +12547,11 @@ msgstr "" "O ramo do submódulo (%s) foi configurado para herdar o ramo do superprojeto, " "mas o superprojeto não está em nenhum ramo" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "o subcomando submodule--helper deve ser invocado com um subcomando" -#: builtin/submodule--helper.c:984 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' não é um subcomando válido de submodule--helper" @@ -11957,7 +12787,7 @@ msgstr "a tag '%s' já existe" msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' atualizada (era %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "A descompactar objetos" @@ -12027,135 +12857,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 [<opções>] [--] [<ficheiro>...]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "refrescar: ignorar submódulos" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "não ignorar novos ficheiros" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "deixar que os ficheiros substituam os diretórios e vice-versa" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "avisar sobre ficheiros que faltem na árvore de trabalho" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "refrescar mesmo que o índice contenha entradas não integradas" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "refrescar informação de stat" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, mas ignorar a definição assume-unchanged" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<caminho>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "adicionar o elemento especificado ao índice" -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "marcar ficheiros como \"não alterados\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "limpar o bit assumed-unchanged" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "marcar ficheiros como \"únicos do índice\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "limpar o bit ignorar-árvore-de-trabalho" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "" "só adicionar ao índice; não adicionar o conteúdo à base de dados de objetos" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "" "remover os caminhos mencionado mesmo se estiverem presentes na árvore de " "trabalho" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "ler lista de caminho a atualizar da entrada padrão" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "adicionar elementos da entrada padrão ao índice" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repovoar as fases nº2 e nº3 dos caminhos listados" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "atualizar apenas elementos que difiram de HEAD" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "ignorar ficheiros não presentes na árvore de trabalho" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "mostrar ações na saída padrão" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "(para porcelanas) esquecer conflitos guardados que não foram resolvidos" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "escrever o índice neste formato" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "ativar ou desativar a divisão do índice" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "ativar ou desativar cache não controlada" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "testar se o sistema de ficheiros suporta cache não controlada" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "ativar cache não controlada sem testar o sistema de ficheiros" -#: 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á definida como true; remova ou altere-a se pretende " +"mesmo desativar a cache não controlada" + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" msgstr "A cache não controlada está desativada" -#: 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á definida como false; remova ou altere-a se pretende " +"mesmo ativar a cache não controlada" + +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "A cache não controlada de '%s' foi ativada." @@ -12358,26 +13204,40 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>" msgid "only useful for debugging" msgstr "apenas útil para depuração" -#: upload-pack.c:20 +#: upload-pack.c:22 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opções>] <dir>" -#: upload-pack.c:837 +#: upload-pack.c:1028 msgid "quit after a single request/response exchange" msgstr "terminar depois de uma única troca de pedido/resposta" -#: upload-pack.c:839 +#: upload-pack.c:1030 msgid "exit immediately after initial ref advertisement" msgstr "sair imediatamente depois do anúncio inicial da referência" -#: upload-pack.c:841 +#: upload-pack.c:1032 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "não tentar <diretório>/.git/ se o <diretório> não for um diretório Git" -#: upload-pack.c:843 +#: upload-pack.c:1034 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromper transferência depois de <n> segundos de inatividade" +#: 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 "" +"As permissões do diretório do socket são demasiado fracas; outros\n" +"utilizadores poderão conseguir as suas credenciais em cache. Considere " +"executar:\n" +"\n" +"\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "imprimir mensagens de depuração no stderr" @@ -12392,7 +13252,11 @@ msgstr "" "guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n" "para ler sobre um subcomando ou conceito específico." -#: http.c:323 +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "Não é suportado delegar controlo com cURL < 7.22.0" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0" @@ -12509,15 +13373,15 @@ msgstr "data-de-validade" msgid "no-op (backward compatibility)" msgstr "sem-ação (retrocompatibilidade)" -#: parse-options.h:237 +#: parse-options.h:238 msgid "be more verbose" msgstr "ser mais verboso" -#: parse-options.h:239 +#: parse-options.h:240 msgid "be more quiet" msgstr "ser mais silencioso" -#: parse-options.h:245 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "usar <n> dígitos para mostrar SHA-1s" @@ -12736,8 +13600,8 @@ msgid "Automated merge did not work." msgstr "A integração automática não funcionou." #: git-merge-octopus.sh:62 -msgid "Should not be doing an Octopus." -msgstr "Não devia estar a fazer um Polvo." +msgid "Should not be doing an octopus." +msgstr "Não se deviria estar a fazer um polvo." #: git-merge-octopus.sh:73 #, sh-format @@ -12904,7 +13768,7 @@ msgstr "Alterações de $mb para $onto:" #: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -"Primeiro, a recuar a cabeça para replicar as suas alterações no topo desta..." +"Primeiro, a recuar a cabeça para replicar as suas alterações no topo dela..." #: git-rebase.sh:620 #, sh-format @@ -12923,6 +13787,10 @@ msgstr "O commit inicial ainda não existe" msgid "Cannot save the current index state" msgstr "Não é possível guardar o estado atual do índice" +#: git-stash.sh:103 +msgid "Cannot save the untracked files" +msgstr "Não é possível guardar os ficheiros não controlados" + #: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Não é possível guardar o estado atual da árvore de trabalho" @@ -12963,6 +13831,11 @@ msgstr "" "erro: opção desconhecida de 'stash save': $option\n" " Para fornecer uma mensagem, use git stash save -- '$option'" +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" +"Não é possível usar --patch e --include-untracked ou --all ao mesmo tempo" + #: git-stash.sh:259 msgid "No local changes to save" msgstr "Não há alterações locais para guardar" @@ -12984,98 +13857,102 @@ msgstr "Diretório de trabalho e estado do índice $stash_msg guardados" msgid "Cannot remove worktree changes" msgstr "Não é possível remover as alterações da árvore de trabalho" -#: git-stash.sh:404 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "opção desconhecido: $opt" -#: git-stash.sh:414 +#: git-stash.sh:416 msgid "No stash found." msgstr "Nenhuma pilha encontrada." -#: git-stash.sh:421 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Demasiadas revisões especificadas: $REV" -#: git-stash.sh:427 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference não é uma referência válida" -#: git-stash.sh:455 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' não é um commit semelhante a pilha" -#: git-stash.sh:466 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' não é uma referência de pilha" -#: git-stash.sh:474 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "não foi possível refrescar o índice" -#: git-stash.sh:478 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "Não é possível aplicar uma pilha durante uma integração" -#: git-stash.sh:486 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "Conflitos no índice. Tente sem --index." -#: git-stash.sh:488 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "Não foi possível guardar árvore do índice" -#: git-stash.sh:522 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "Não foi possível restaurar os ficheiros não controlados da pilha" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "Não é possível despreparar os ficheiros modificado" -#: git-stash.sh:537 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "O índice não foi reposto." -#: git-stash.sh:551 +#: git-stash.sh:562 msgid "The stash is kept in case you need it again." msgstr "A pilha é guarda no caso de precisar dela de novo." -#: git-stash.sh:560 +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "A descartar ${REV} ($s)" -#: git-stash.sh:561 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Não foi possível descartar elemento da pilha" -#: git-stash.sh:569 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "Nenhum nome de ramo especificado" -#: git-stash.sh:641 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(Para os restaurar execute \"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 "" "Os caminhos relativos só podem ser usados a partir do topo da árvore de " "trabalho" -#: git-submodule.sh:193 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../" -#: git-submodule.sh:210 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' já existe no índice" -#: git-submodule.sh:214 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13086,23 +13963,23 @@ msgstr "" "$sm_path\n" "Use -f se pretende mesmo adicioná-lo." -#: git-submodule.sh:232 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "A adicionar repositório existente em '$sm_path' ao índice" -#: 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' já existe e não é uma repositório git válido" -#: git-submodule.sh:242 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Um diretório git de '$sm_name' foi encontrado localmente com os remotos:" -#: 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" @@ -13118,49 +13995,49 @@ msgstr "" "ou não tem a certeza o que isto significa escolha outro nome com a opção '--" "name'." -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "A reativar o diretório git local do submódulo '$sm_name'." -#: git-submodule.sh:262 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Não foi possível extrair o submódulo '$sm_path'" -#: git-submodule.sh:267 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falha ao adicionar o submódulo '$sm_path'" -#: git-submodule.sh:276 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falha ao registar o submódulo '$sm_path'" -#: git-submodule.sh:323 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "A entrar em '$displaypath'" -#: git-submodule.sh:343 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Interrompido em '$displaypath'; o script retornou um valor diferente de zero." -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "especificador de caminho e --all são incompatíveis" -#: git-submodule.sh:419 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Use '--all' se pretende mesmo anular a inicialização todos os submódulos" -#: git-submodule.sh:439 +#: git-submodule.sh:440 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13169,7 +14046,7 @@ msgstr "" "A árvore de trabalho do submódulo '$displaypath' contem um diretório .git\n" "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)" -#: git-submodule.sh:447 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13178,41 +14055,41 @@ msgstr "" "A árvore de trabalho do submódulo '$displaypath' contém alterações locais; " "use '-f' para as descartar" -#: git-submodule.sh:450 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Diretório '$displaypath' limpo" -#: git-submodule.sh:451 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Não foi possível remover a árvore de trabalho do submódulo '$displaypath'" -#: git-submodule.sh:454 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'" -#: git-submodule.sh:463 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Não foi possível encontrar a revisão atual no caminho de submódulo " "'$displaypath'" -#: git-submodule.sh:622 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Não foi possível obter no caminho de submódulo '$sm_path'" -#: git-submodule.sh:627 +#: git-submodule.sh:632 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -13221,12 +14098,12 @@ msgstr "" "Não foi possível encontrar a revisão atual ${remote_name}/${branch} no " "caminho de submódulo '$sm_path'" -#: git-submodule.sh:645 +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Não é possível obter no caminho de submódulo '$displaypath'" -#: git-submodule.sh:651 +#: git-submodule.sh:656 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -13235,88 +14112,84 @@ msgstr "" "Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. " "Falha ao obter aquele commit diretamente." -#: git-submodule.sh:658 +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:659 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído" -#: git-submodule.sh:663 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Não foi possível efetuar rebase de '$sha1' no caminho de submódulo " "'$displaypath'" -#: git-submodule.sh:664 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'" -#: git-submodule.sh:669 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:670 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'" -#: git-submodule.sh:675 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:676 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Caminho de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:707 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'" -#: git-submodule.sh:815 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "A opção --cached não pode ser usada com a opção --files" -#: git-submodule.sh:867 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo inesperado $mod_dst" -#: git-submodule.sh:887 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Aviso: $display_name não contém o commit $sha1_src" -#: git-submodule.sh:890 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warn: $display_name não contém o commit $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 " Warn: $display_name contém os commits $sha1_src e $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 "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'" -#: git-submodule.sh:1107 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "A sincronizar o URL do submódulo '$displaypath'" @@ -13611,8 +14484,12 @@ msgstr "" "Ignorado." #: git-rebase--interactive.sh:1044 -msgid "You can fix this with 'git rebase --edit-todo'." -msgstr "Pode corrí-lo com 'git rebase --edit-todo'." +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "" +"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --" +"continue'." #: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." @@ -13635,7 +14512,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 "" @@ -13683,44 +14560,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 "Não foi possível executar o editor" -#: git-rebase--interactive.sh:1145 -msgid "You need to set your committer info first" -msgstr "Primeiro tem de definir a sua informação de committer" - -#: git-rebase--interactive.sh:1153 +#: git-rebase--interactive.sh:1150 #, sh-format msgid "Could not checkout $switch_to" msgstr "Não foi possível extrair $switch_to" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1155 msgid "No HEAD?" msgstr "Sem HEAD?" -#: git-rebase--interactive.sh:1159 +#: git-rebase--interactive.sh:1156 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Não foi possível criar $state_dir temporário" -#: git-rebase--interactive.sh:1161 +#: git-rebase--interactive.sh:1158 msgid "Could not mark as interactive" msgstr "Não foi possível marcar como interativo" -#: 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 "Não foi possível inicializar commits reescritos" -#: 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] "Rebase $shortrevisions sobre $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)" -#: git-rebase--interactive.sh:1281 +#: git-rebase--interactive.sh:1278 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -13730,7 +14603,7 @@ msgstr "" "No entanto, se remover tudo, o rebase será abortado.\n" "\n" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1285 msgid "Note that empty commits are commented out" msgstr "Note que commits vazios são comentados" @@ -13758,6 +14631,10 @@ msgstr "Não é possível rebasear: tem alterações não preparadas." msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Não é possível reescrever ramos: tem alterações não preparadas." +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "Não é possível puxar com rebase: tem alterações não preparadas." + #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." @@ -13767,12 +14644,21 @@ msgstr "Não é possível efetuar $action: tem alterações não preparadas." msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "Não é possível rebasear: o índice contém alterações não submetidas." +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"Não é possível puxar com rebase: o índice contém alterações não submetidas." + #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Não é possível efetuar $action: o índice contém alterações não submetidas." +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Além disso, o índice contém alterações não submetidas." + #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "" @@ -13782,6 +14668,44 @@ msgstr "" msgid "Unable to determine absolute path of git directory" msgstr "Não é possível determinar o caminho absoluto do diretório git" +#~ msgid "Could not write to %s" +#~ msgstr "Não foi possível escrever em %s" + +#~ msgid "Error wrapping up %s." +#~ msgstr "Erro ao rematar %s." + +#~ msgid "Your local changes would be overwritten by cherry-pick." +#~ msgstr "As suas alterações locais serão substituídas por cherry-pick." + +#~ msgid "Cannot revert during another revert." +#~ msgstr "Não é possível reverter durante outra reversão." + +#~ msgid "Cannot cherry-pick during another cherry-pick." +#~ msgstr "" +#~ "Não é possível efetuar cherry-pick durante outro cherry-pick. durante um " +#~ "cherry-pick." + +#~ msgid "Could not parse line %d." +#~ msgstr "Não foi possível analisar a linha %d." + +#~ msgid "Could not open %s" +#~ msgstr "Não foi possível abrir %s" + +#~ msgid "Could not read %s." +#~ msgstr "Não foi possível ler %s." + +#~ msgid "Could not format %s." +#~ msgstr "Não foi possível formatar %s." + +#~ msgid "%s: %s" +#~ msgstr "%s: %s" + +#~ msgid "cannot open %s: %s" +#~ msgstr "não é possível abrir %s: %s" + +#~ msgid "You need to set your committer info first" +#~ msgstr "Primeiro tem de definir a sua informação de committer" + #~ msgid "bad numeric config value '%s' for '%s': invalid unit" #~ msgstr "" #~ "valor numérico '%s' da configuração '%s' incorreto: unidade inválida" @@ -13956,9 +14880,6 @@ msgstr "Não é possível determinar o caminho absoluto do diretório git" #~ msgid "Verify that the named commit has a valid GPG signature" #~ msgstr "verificar se o commit tem uma assinatura GPG válida" -#~ msgid "Could not write to '%s'" -#~ msgstr "Não foi possível escrever em '%s'" - #~ msgid "Writing SQUASH_MSG" #~ msgstr "A escrever SQUASH_MSG" @@ -14171,8 +15092,5 @@ msgstr "Não é possível determinar o caminho absoluto do diretório git" #~ msgid "--" #~ msgstr "--" -#~ msgid "cherry-pick" -#~ msgstr "cherry-pick" - #~ msgid "Please enter the commit message for your changes." #~ msgstr "Por favor insira a mensagem de commit das suas alterações." @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-05-24 23:42+0800\n" -"PO-Revision-Date: 2016-06-30 13:28+0000\n" +"POT-Creation-Date: 2016-08-27 23:21+0800\n" +"PO-Revision-Date: 2016-10-16 17:25+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -25,24 +25,69 @@ msgstr "" msgid "hint: %.*s\n" msgstr "подсказка: %.*s\n" -#: advice.c:88 +#: advice.c:83 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы." + +#: advice.c:85 +msgid "Committing is not possible because you have unmerged files." +msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы." + +#: advice.c:87 +msgid "Merging is not possible because you have unmerged files." +msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы." + +#: advice.c:89 +msgid "Pulling is not possible because you have unmerged files." +msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы." + +#: advice.c:91 +msgid "Reverting is not possible because you have unmerged files." +msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы." + +#: advice.c:93 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы." + +#: advice.c:101 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." -#: advice.c:101 builtin/merge.c:1238 +#: advice.c:109 +msgid "Exiting because of an unresolved conflict." +msgstr "Выход из-за неразрешенного конфликта." + +#: advice.c:114 builtin/merge.c:1181 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." -#: advice.c:103 +#: advice.c:116 msgid "Please, commit your changes before merging." msgstr "Перед слиянием, выполните коммит ваших изменений." -#: advice.c:104 +#: advice.c:117 msgid "Exiting because of unfinished merge." msgstr "Выход из-за незавершенного слияния." +#: advice.c:123 +#, c-format +msgid "" +"Note: checking out '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by performing another checkout.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -b with the checkout command again. Example:\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" +msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\n\n" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" @@ -61,7 +106,7 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>] msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "спецификация пути «%s» не соответствует ни одному файлу" @@ -74,7 +119,7 @@ msgstr "формат" msgid "archive format" msgstr "формат архива" -#: archive.c:430 builtin/log.c:1395 +#: archive.c:430 builtin/log.c:1422 msgid "prefix" msgstr "префикс" @@ -82,11 +127,11 @@ msgstr "префикс" msgid "prepend prefix to each pathname in the archive" msgstr "добавлять префикс перед каждым путем файла в архиве" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 -#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: 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:459 builtin/ls-files.c:462 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 +#: 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 msgid "file" msgstr "файл" @@ -119,7 +164,7 @@ msgid "list supported archive formats" msgstr "перечислить поддерживаемые форматы архивов" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:776 +#: builtin/submodule--helper.c:832 msgid "repo" msgstr "репозиторий" @@ -127,7 +172,7 @@ msgstr "репозиторий" msgid "retrieve the archive from remote repository <repo>" msgstr "получить архив из внешнего <репозитория>" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 msgid "command" msgstr "команда" @@ -135,12 +180,147 @@ msgstr "команда" msgid "path to the remote git-upload-archive command" msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "Неожиданная опция --remote" + +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "Опция --exec может использоваться только вместе с --remote" + +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "Неожиданная опция --output" + +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Неизвестный формат архива «%s»" + +#: archive.c:494 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "Аргумент не поддерживается для формата «%s»: -%d" + #: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»." +#: bisect.c:441 +#, c-format +msgid "Could not open file '%s'" +msgstr "Не удалось открыть файл «%s»" + +#: bisect.c:446 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "Плохое содержимое файла «%s»: %s" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "Невозможно продолжить бинарный поиск!\n" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "Недопустимое имя коммита %s" + +#: bisect.c:732 +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n" + +#: bisect.c:737 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n" + +#: bisect.c:742 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n" + +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n" + +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск." + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "Бинарный поиск: база слияния должна быть проверена\n" + +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "нужно указать %s редакцию" + +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#, c-format +msgid "could not create file '%s'" +msgstr "не удалось создать файл «%s»" + +#: bisect.c:917 +#, c-format +msgid "could not read file '%s'" +msgstr "не удалось прочитать файл «%s»" + +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "сбой при чтении ссылок двоичного поиска" + +#: bisect.c:967 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s была одновременно и %s и %s\n" + +#: bisect.c:975 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n" + +#: bisect.c:994 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(примерно %d шаг)" +msgstr[1] "(примерно %d шага)" +msgstr[2] "(примерно %d шагов)" +msgstr[3] "(примерно %d шагов)" + +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "Бинарный поиск: %d редакцию осталось проверить после этой %s\n" +msgstr[1] "Бинарный поиск: %d редакции осталось проверить после этой %s\n" +msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" +msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" + #: branch.c:53 #, c-format msgid "" @@ -276,7 +456,7 @@ msgstr "«%s» не похож на файл пакета версии 2" msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:777 +#: bundle.c:87 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "не удалось открыть «%s»" @@ -285,10 +465,10 @@ msgstr "не удалось открыть «%s»" msgid "Repository lacks these prerequisite commits:" msgstr "В репозитории отсутствуют необходимые коммиты:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 -#: builtin/merge.c:361 builtin/shortlog.c:170 +#: 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 +#: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "сбой инициализации прохода по редакциям" @@ -331,7 +511,7 @@ msgstr "критическая ошибка rev-list" msgid "ref '%s' is excluded by the rev-list options" msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" -#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" @@ -349,13 +529,13 @@ msgstr "не удалось создать «%s»" msgid "index-pack died" msgstr "критическая ошибка index-pack" -#: color.c:275 +#: color.c:290 #, c-format msgid "invalid color value: %.*s" msgstr "недопустимое значение цвета: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 -#: builtin/am.c:2134 +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 +#: builtin/am.c:2119 #, c-format msgid "could not parse %s" msgstr "не удалось разобрать %s" @@ -369,86 +549,148 @@ msgstr "%s %s не является коммитом!" msgid "memory exhausted" msgstr "память исчерпана" -#: config.c:475 config.c:477 +#: config.c:516 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "ошибка в %d строке двоичного объекта %s" + +#: config.c:520 +#, c-format +msgid "bad config line %d in file %s" +msgstr "ошибка в %d строке файла %s" + +#: config.c:524 +#, c-format +msgid "bad config line %d in standard input" +msgstr "ошибка в %d строке стандартного ввода" + +#: config.c:528 #, c-format -msgid "bad config line %d in %s %s" -msgstr "ошибка в %d строке файла конфигурации в %s %s" +msgid "bad config line %d in submodule-blob %s" +msgstr "ошибка в %d строке двоичного объекта подмодуля %s" -#: config.c:593 +#: config.c:532 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s %s: %s" -msgstr "неправильное числовое значение «%s» для «%s» в %s %s: %s" +msgid "bad config line %d in command line %s" +msgstr "ошибка в %d строке коммандной строки %s" -#: config.c:595 +#: config.c:536 +#, c-format +msgid "bad config line %d in %s" +msgstr "ошибка в %d строке в %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': %s" msgstr "неправильное числовое значение «%s» для «%s»: %s" -#: config.c:680 +#: config.c:666 +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s" + +#: config.c:669 +#, c-format +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 standard input: %s" +msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s" + +#: config.c:675 +#, c-format +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 command line %s: %s" +msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s" + +#: config.c:681 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "неправильное числовое значение «%s» для «%s» в %s: %s" + +#: config.c:768 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "сбой разворачивания пути каталога пользователя: «%s»" -#: config.c:761 config.c:772 +#: config.c:849 config.c:860 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень сжатия zlib %d" -#: config.c:890 +#: config.c:978 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопустимый режим создания объекта: %s" -#: config.c:1228 +#: config.c:1312 msgid "unable to parse command-line config" msgstr "не удалось разобрать конфигурацию из командной строки" -#: config.c:1284 -msgid "unknown error occured while reading the configuration files" +#: config.c:1362 +msgid "unknown error occurred while reading the configuration files" msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" -#: config.c:1629 +#: config.c:1716 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "не удалось разобрать «%s» в конфигурации из командной строки" -#: config.c:1631 +#: config.c:1718 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" -#: config.c:1690 +#: config.c:1777 #, c-format msgid "%s has multiple values" msgstr "%s имеет несколько значений" -#: config.c:2224 +#: config.c:2311 #, c-format msgid "could not set '%s' to '%s'" msgstr "не удалось установить «%s» в «%s»" -#: config.c:2226 +#: config.c:2313 #, c-format msgid "could not unset '%s'" msgstr "не удалось сбросить значение для «%s»" -#: connected.c:69 +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "Проверка соединения" + +#: connected.c:74 msgid "Could not run 'git rev-list'" msgstr "Не удалось запустить «git rev-list»" -#: connected.c:89 +#: connected.c:94 msgid "failed write to rev-list" msgstr "сбой записи в rev-list" -#: connected.c:96 +#: connected.c:101 msgid "failed to close rev-list's stdin" msgstr "сбой закрытия стандартного ввода у rev-list" -#: date.c:95 +#: date.c:97 msgid "in the future" msgstr "в будущем" -#: date.c:101 +#: date.c:103 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" @@ -457,7 +699,7 @@ msgstr[1] "%lu секунды назад" msgstr[2] "%lu секунд назад" msgstr[3] "%lu секунд назад" -#: date.c:108 +#: date.c:110 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" @@ -466,7 +708,7 @@ msgstr[1] "%lu минуты назад" msgstr[2] "%lu минут назад" msgstr[3] "%lu минут назад" -#: date.c:115 +#: date.c:117 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" @@ -475,7 +717,7 @@ msgstr[1] "%lu часа назад" msgstr[2] "%lu часов назад" msgstr[3] "%lu часов назад" -#: date.c:122 +#: date.c:124 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" @@ -484,7 +726,7 @@ msgstr[1] "%lu дня назад" msgstr[2] "%lu дней назад" msgstr[3] "%lu дней назад" -#: date.c:128 +#: date.c:130 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" @@ -493,7 +735,7 @@ msgstr[1] "%lu недели назад" msgstr[2] "%lu недель назад" msgstr[3] "%lu недель назад" -#: date.c:135 +#: date.c:137 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" @@ -502,7 +744,7 @@ msgstr[1] "%lu месяца назад" msgstr[2] "%lu месяцев назад" msgstr[3] "%lu месяцев назад" -#: date.c:146 +#: date.c:148 #, c-format msgid "%lu year" msgid_plural "%lu years" @@ -512,7 +754,7 @@ msgstr[2] "%lu лет" msgstr[3] "%lu лет" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:151 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" @@ -521,7 +763,7 @@ msgstr[1] "%s и %lu месяца назад" msgstr[2] "%s и %lu месяцев назад" msgstr[3] "%s и %lu месяцев назад" -#: date.c:154 date.c:159 +#: date.c:156 date.c:161 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -535,7 +777,7 @@ msgstr[3] "%lu лет назад" msgid "failed to read orderfile '%s'" msgstr "сбой чтения orderfile «%s»" -#: diffcore-rename.c:538 +#: diffcore-rename.c:540 msgid "Performing inexact rename detection" msgstr "Выполняется неточное определение переименования" @@ -561,23 +803,23 @@ msgid "" "%s" msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" -#: diff.c:3007 +#: diff.c:3017 #, c-format msgid "external diff died, stopping at %s" msgstr "критическая ошибка при внешнем сравнении, останов на %s" -#: diff.c:3405 +#: diff.c:3415 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одной спецификации пути" -#: diff.c:3568 +#: diff.c:3578 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" -#: diff.c:3582 +#: diff.c:3592 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Сбой разбора параметра опции --submodule: «%s»" @@ -590,39 +832,30 @@ msgstr "не удалось получить имя ядра и информац msgid "Untracked cache is disabled on this system or location." msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте." -#: gpg-interface.c:166 gpg-interface.c:235 -msgid "could not run gpg." -msgstr "не удалось запустить gpg." - #: gpg-interface.c:178 -msgid "gpg did not accept the data" -msgstr "gpg не принял данные" - -#: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "gpg не удалось подписать данные" -#: gpg-interface.c:222 -#, c-format -msgid "could not create temporary file '%s'" -msgstr "не удалось создать временный файл «%s»" +#: gpg-interface.c:208 +msgid "could not create temporary file" +msgstr "не удалось создать временный файл" -#: gpg-interface.c:224 +#: gpg-interface.c:210 #, c-format msgid "failed writing detached signature to '%s'" msgstr "сбой записи отсоединенной подписи в «%s»" -#: grep.c:1718 +#: grep.c:1792 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалось прочесть %s" -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "не удалось выполнить stat «%s»" -#: grep.c:1746 +#: grep.c:1820 #, c-format msgid "'%s': short read" msgstr "«%s»: слишком мало данных прочитано" @@ -668,7 +901,7 @@ msgstr "через %0.1f секунд автоматически…" msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: «%s» не является командой git. Смотрите «git --help»." -#: help.c:404 help.c:464 +#: help.c:404 help.c:470 msgid "" "\n" "Did you mean this?" @@ -680,7 +913,7 @@ msgstr[1] "\nВозможно, вы имели в виду что-то из эт msgstr[2] "\nВозможно, вы имели в виду что-то из этого?" msgstr[3] "\nВозможно, вы имели в виду что-то из этого?" -#: help.c:460 +#: help.c:466 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" @@ -706,237 +939,223 @@ msgstr "Не удалось создать «%s.lock»: %s" msgid "failed to read the cache" msgstr "сбой чтения кэша" -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:732 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 +#: builtin/checkout.c:589 builtin/clone.c:732 msgid "unable to write new index file" msgstr "не удалось записать новый файл индекса" -#: merge-recursive.c:189 -#, c-format +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "(плохой коммит)\n" -#: merge-recursive.c:209 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "сбой addinfo_cache для пути «%s»" -#: merge-recursive.c:270 +#: merge-recursive.c:301 msgid "error building trees" msgstr "ошибка при построении деревьев" -#: merge-recursive.c:689 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "не удалось создать путь «%s»%s" -#: merge-recursive.c:700 +#: merge-recursive.c:731 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" -#: merge-recursive.c:714 merge-recursive.c:735 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr ": возможно, конфликт каталогов/файлов?" -#: merge-recursive.c:725 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "отказ потери неотслеживаемого файла в «%s»" -#: merge-recursive.c:765 +#: merge-recursive.c:796 #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" -#: merge-recursive.c:767 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" msgstr "ожидается двоичный объект для %s «%s»" -#: merge-recursive.c:790 builtin/clone.c:376 +#: merge-recursive.c:822 #, c-format -msgid "failed to open '%s'" -msgstr "не удалось открыть «%s»" +msgid "failed to open '%s': %s" +msgstr "не удалось открыть «%s»: %s" -#: merge-recursive.c:798 +#: merge-recursive.c:833 #, c-format -msgid "failed to symlink '%s'" -msgstr "не удалось создать символьную ссылку «%s»" +msgid "failed to symlink '%s': %s" +msgstr "не удалось создать символьную ссылку «%s»: %s" -#: merge-recursive.c:801 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "не понятно, что делать с %06o %s «%s»" -#: merge-recursive.c:939 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "Не удалось запустить внутреннее слияние" -#: merge-recursive.c:943 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "Не удалось добавить %s в базу данных" -#: merge-recursive.c:959 -msgid "unsupported object type in the tree" -msgstr "объект неподдерживаемого типа в дереве" - -#: merge-recursive.c:1034 merge-recursive.c:1048 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1040 merge-recursive.c:1053 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "rename" msgstr "переименование" -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "renamed" msgstr "переименовано" -#: merge-recursive.c:1150 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s — это каталог в %s, добавляем как %s вместо этого" -#: merge-recursive.c:1172 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" -#: merge-recursive.c:1177 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (оставлено неразрешенным)" -#: merge-recursive.c:1231 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»" -#: merge-recursive.c:1261 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Переименовываю %s в %s и %s в %s вместо этого" -#: merge-recursive.c:1460 +#: merge-recursive.c:1531 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" -#: merge-recursive.c:1470 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "Добавление слитого %s" -#: merge-recursive.c:1475 merge-recursive.c:1677 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "Добавление вместо этого как %s" -#: merge-recursive.c:1526 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "невозможно прочитать объект «%s»" -#: merge-recursive.c:1529 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" msgstr "объект %s не является двоичным объектом" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modify" msgstr "изменение" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modified" msgstr "изменено" -#: merge-recursive.c:1591 +#: merge-recursive.c:1676 msgid "content" msgstr "содержимое" -#: merge-recursive.c:1598 +#: merge-recursive.c:1683 msgid "add/add" msgstr "добавление/добавление" -#: merge-recursive.c:1632 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "Автослияние %s" -#: merge-recursive.c:1650 git-submodule.sh:941 +#: merge-recursive.c:1736 git-submodule.sh:919 msgid "submodule" msgstr "подмодуль" -#: merge-recursive.c:1651 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: merge-recursive.c:1762 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "файл/каталог" -#: merge-recursive.c:1768 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "каталог/файл" -#: merge-recursive.c:1773 +#: merge-recursive.c:1868 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»" -#: merge-recursive.c:1781 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "Добавление %s" -#: merge-recursive.c:1798 -msgid "Fatal merge failure, shouldn't happen." -msgstr "Критическая ошибка слияния, такого не должно случаться." - -#: merge-recursive.c:1817 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "Уже обновлено!" -#: merge-recursive.c:1826 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "сбой слияния деревьев «%s» и «%s»" -#: merge-recursive.c:1856 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "Необработанный путь??? %s" - -#: merge-recursive.c:1904 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "Слияние:" -#: merge-recursive.c:1917 +#: merge-recursive.c:2019 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -945,16 +1164,16 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" msgstr[3] "найдено %u общих предков:" -#: merge-recursive.c:1954 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "слияние не вернуло коммит" -#: merge-recursive.c:2011 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "Не удалось разобрать объект «%s»" -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "Не удается записать индекс." @@ -1014,7 +1233,7 @@ msgstr "-КОЛИЧЕСТВО" msgid "malformed object name '%s'" msgstr "Неправильное имя объекта «%s»" -#: path.c:796 +#: path.c:798 #, c-format msgid "Could not make %s writable by group" msgstr "Не удалось предоставить доступ к %s на запись" @@ -1079,7 +1298,7 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "Не указан шаблон для исключения с помощью :(exclude).\nВозможно, вы забыли «:/» или «.» ?" -#: pretty.c:971 +#: pretty.c:973 msgid "unable to parse --pretty format" msgstr "не удалось разобрать формат для --pretty" @@ -1101,23 +1320,22 @@ msgid "" "Using version %i" msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 -#: builtin/merge.c:995 +#: refs.c:551 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "Не удалось открыть «%s» для записи" -#: refs/files-backend.c:2243 +#: refs/files-backend.c:2534 #, c-format msgid "could not delete reference %s: %s" msgstr "не удалось удалить ссылку %s: %s" -#: refs/files-backend.c:2246 +#: refs/files-backend.c:2537 #, c-format msgid "could not delete references: %s" msgstr "не удалось удалить ссылки: %s" -#: refs/files-backend.c:2255 +#: refs/files-backend.c:2546 #, c-format msgid "could not remove reference %s" msgstr "не удалось удалить ссылки %s" @@ -1275,63 +1493,63 @@ msgstr "%s отслеживает и %s и %s" msgid "Internal error" msgstr "Внутренняя ошибка" -#: remote.c:1678 remote.c:1721 +#: remote.c:1677 remote.c:1720 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1687 +#: remote.c:1686 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1690 +#: remote.c:1689 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышестоящая ветка не настроена для ветки «%s»" -#: remote.c:1696 +#: remote.c:1695 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" -#: remote.c:1711 +#: remote.c:1710 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки" -#: remote.c:1726 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего сервера для отправки" -#: remote.c:1737 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "спецификации пути для отправки «%s» не включают в себя «%s»" -#: remote.c:1750 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)" -#: remote.c:1772 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "не удалось выполнить «simple» отправку в единственную точку назначения" -#: remote.c:2074 +#: remote.c:2073 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" -#: remote.c:2078 +#: remote.c:2077 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "(для исправления запустите «git branch --unset-upstream»)\n" -#: remote.c:2081 +#: remote.c:2080 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ваша ветка обновлена в соответствии с «%s».\n" -#: remote.c:2085 +#: remote.c:2084 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" @@ -1340,11 +1558,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита. msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n" -#: remote.c:2091 +#: remote.c:2090 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" -#: remote.c:2094 +#: remote.c:2093 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1354,11 +1572,11 @@ msgstr[1] "Ваша ветка отстает от «%s» на %d коммита msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" -#: remote.c:2102 +#: remote.c:2101 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" -#: remote.c:2105 +#: remote.c:2104 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1371,20 +1589,20 @@ msgstr[1] "Ваша ветка и «%s» разделились\nи теперь msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" -#: remote.c:2115 +#: remote.c:2114 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" -#: revision.c:2142 +#: revision.c:2132 msgid "your current branch appears to be broken" msgstr "похоже, ваша текущая ветка повреждена" -#: revision.c:2145 +#: revision.c:2135 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" -#: revision.c:2339 +#: revision.c:2329 msgid "--first-parent is incompatible with --bisect" msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" @@ -1397,24 +1615,28 @@ msgstr "сбой открытия /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) сбой" -#: send-pack.c:295 +#: send-pack.c:298 msgid "failed to sign the push certificate" msgstr "сбой подписания сертификата отправки" -#: send-pack.c:404 +#: send-pack.c:411 msgid "the receiving end does not support --signed push" msgstr "принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:406 +#: send-pack.c:413 msgid "" "not sending a push certificate since the receiving end does not support " "--signed push" msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:418 +#: send-pack.c:425 msgid "the receiving end does not support --atomic push" msgstr "принимающая сторона не поддерживает отправку с опцией --atomic" +#: send-pack.c:430 +msgid "the receiving end does not support push options" +msgstr "принимающая сторона не поддерживает отправку с опциями" + #: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" @@ -1428,15 +1650,15 @@ msgid "" "and commit the result with 'git commit'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" -#: sequencer.c:190 sequencer.c:833 sequencer.c:912 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924 #, c-format msgid "Could not write to %s" msgstr "Не удалось записать в %s" -#: sequencer.c:193 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928 #, c-format -msgid "Error wrapping up %s" -msgstr "Ошибка оборачивания %s" +msgid "Error wrapping up %s." +msgstr "Ошибка оборачивания %s." #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." @@ -1450,202 +1672,232 @@ msgstr "Ваши локальные изменения будут перезап msgid "Commit your changes or stash them to proceed." msgstr "Сделайте коммит или спрячьте ваши изменения для продолжения." +#: sequencer.c:228 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: перемотка вперед" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:300 +#: sequencer.c:303 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Не удалось записать файл индекса" -#: sequencer.c:318 +#: sequencer.c:321 msgid "Could not resolve HEAD commit\n" msgstr "Не удалось определить HEAD коммит\n" -#: sequencer.c:338 +#: sequencer.c:341 msgid "Unable to update cache tree\n" msgstr "Не удалось обновить дерево кэша\n" -#: sequencer.c:390 +#: sequencer.c:393 #, c-format msgid "Could not parse commit %s\n" msgstr "Не удалось разобрать коммит %s\n" -#: sequencer.c:395 +#: sequencer.c:398 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Не удалось разобрать родительскую коммит %s\n" -#: sequencer.c:460 +#: sequencer.c:463 msgid "Your index file is unmerged." msgstr "Ваш файл индекса не слит." -#: sequencer.c:479 +#: sequencer.c:482 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Коммит %s — это коммит-слияние, но опция -m не указана." -#: sequencer.c:487 +#: sequencer.c:490 #, c-format msgid "Commit %s does not have parent %d" msgstr "У коммита %s нет предка %d" -#: sequencer.c:491 +#: sequencer.c:494 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Основная ветка указана, но коммит %s не является слиянием." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:504 +#: sequencer.c:507 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: не удалось разобрать родительский коммит для %s" -#: sequencer.c:508 +#: sequencer.c:511 #, c-format msgid "Cannot get commit message for %s" msgstr "Не удалось получить сообщение коммита для %s" -#: sequencer.c:594 +#: sequencer.c:597 #, c-format msgid "could not revert %s... %s" msgstr "не удалось обратить изменения коммита %s… %s" -#: sequencer.c:595 +#: sequencer.c:598 #, c-format msgid "could not apply %s... %s" msgstr "не удалось применить коммит %s… %s" -#: sequencer.c:630 +#: sequencer.c:633 msgid "empty commit set passed" msgstr "передан пустой набор коммитов" -#: sequencer.c:638 +#: sequencer.c:641 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: сбой чтения индекса" -#: sequencer.c:642 +#: sequencer.c:645 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: сбой обновления индекса" -#: sequencer.c:702 -#, c-format -msgid "Cannot %s during a %s" -msgstr "Не удалось %s во время %s" +#: sequencer.c:705 +msgid "Cannot revert during another revert." +msgstr "Нельзя обратить изменения коммита во время другого процесса обращения коммита." + +#: sequencer.c:706 +msgid "Cannot revert during a cherry-pick." +msgstr "Нельзя обратить изменения коммита во время копирования коммита." + +#: sequencer.c:709 +msgid "Cannot cherry-pick during a revert." +msgstr "Нельзя скопировать коммит во время процесса обращения коммита." -#: sequencer.c:724 +#: sequencer.c:710 +msgid "Cannot cherry-pick during another cherry-pick." +msgstr "Нельзя скопировать коммит во время другого процесса копирования коммита." + +#: sequencer.c:732 #, c-format msgid "Could not parse line %d." msgstr "Не удалось разобрать строку %d." -#: sequencer.c:729 +#: sequencer.c:737 msgid "No commits parsed." msgstr "Коммиты не разобраны." -#: sequencer.c:741 +#: sequencer.c:749 #, c-format msgid "Could not open %s" msgstr "Не удалось открыть %s" -#: sequencer.c:745 +#: sequencer.c:753 #, c-format msgid "Could not read %s." msgstr "Не удалось прочитать %s." -#: sequencer.c:752 +#: sequencer.c:760 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Непригодная для использования карта с инструкциями: %s" -#: sequencer.c:782 +#: sequencer.c:790 #, c-format msgid "Invalid key: %s" msgstr "Недействительный ключ: %s" -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "Неправильное значение %s: %s" -#: sequencer.c:795 +#: sequencer.c:803 #, c-format msgid "Malformed options sheet: %s" msgstr "Повреждённая карта с опциями: %s" -#: sequencer.c:814 +#: sequencer.c:822 msgid "a cherry-pick or revert is already in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:815 +#: sequencer.c:823 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" -#: sequencer.c:819 +#: sequencer.c:827 #, c-format msgid "Could not create sequencer directory %s" msgstr "Не удалось создать каталог для указателя следования коммитов %s" -#: sequencer.c:835 sequencer.c:916 -#, c-format -msgid "Error wrapping up %s." -msgstr "Ошибка оборачивания %s." - -#: sequencer.c:854 sequencer.c:986 +#: sequencer.c:862 sequencer.c:998 msgid "no cherry-pick or revert in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:856 +#: sequencer.c:864 msgid "cannot resolve HEAD" msgstr "не удалось определить HEAD" -#: sequencer.c:858 +#: sequencer.c:866 sequencer.c:900 msgid "cannot abort from a branch yet to be born" msgstr "нельзя отменить изменения с ветки, которая еще не создана" -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 #, c-format msgid "cannot open %s" msgstr "не удалось открыть %s" -#: sequencer.c:880 +#: sequencer.c:888 #, c-format msgid "cannot read %s: %s" msgstr "не удалось прочитать %s: %s" -#: sequencer.c:881 +#: sequencer.c:889 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:887 +#: sequencer.c:895 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден" -#: sequencer.c:909 +#: sequencer.c:921 #, c-format msgid "Could not format %s." msgstr "Не удалось отформатировать %s." -#: sequencer.c:1054 +#: sequencer.c:1066 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалось скопировать коммит %s" -#: sequencer.c:1057 +#: sequencer.c:1069 #, c-format msgid "%s: bad revision" msgstr "%s: плохая редакция" -#: sequencer.c:1091 +#: sequencer.c:1102 msgid "Can't revert as initial commit" msgstr "Нельзя обратить изменения изначального коммита" -#: sequencer.c:1092 -msgid "Can't cherry-pick into empty head" -msgstr "Нельзя скопировать коммит в пустую ветку" +#: setup.c:160 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "%s: нет такого пути в рабочем каталоге.\nИспользуйте «git <команда> -- <путь>…» для указания путей, которые не существуют локально." + +#: setup.c:173 +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" + +#: setup.c:223 +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:248 +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 #, c-format msgid "failed to read %s" msgstr "не удалось прочитать %s" @@ -1659,16 +1911,48 @@ msgstr "Ожидаемая версия git репозитория <= %d, а о msgid "unknown repository extensions found:" msgstr "обнаружены неизвестные расширения репозитория:" -#: sha1_file.c:1080 +#: setup.c:762 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "Не найден git репозитоий (или один из его каталогов): %s" + +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" +msgstr "Не удалось вернуться в текущий рабочий каталог" + +#: setup.c:845 +msgid "Unable to read current working directory" +msgstr "Не удалось прочитать текущий рабочий каталог" + +#: setup.c:920 +#, c-format +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "Не найден git репозитоий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)." + +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" +msgstr "Перейти в «%s/..»" + +#: setup.c:989 +#, c-format +msgid "" +"Problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "Проблема со значением режима доступа к файлу core.sharedRepository (0%.3o).\nВладелец файлов должен всегда иметь права на чтение и на запись." + +#: sha1_file.c:1046 msgid "offset before end of packfile (broken .idx?)" msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" -#: sha1_file.c:2458 +#: sha1_file.c:2434 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" -#: sha1_file.c:2462 +#: sha1_file.c:2438 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" @@ -1713,7 +1997,7 @@ msgstr "сбой индексирования обновленного .gitmodul msgid "negative values not allowed for submodule.fetchJobs" msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs" -#: submodule-config.c:355 +#: submodule-config.c:358 #, c-format msgid "invalid value for %s" msgstr "неправильное значение %s" @@ -1772,6 +2056,43 @@ msgstr "не удалось создать временный файл" msgid "could not rename temporary file to %s" msgstr "не удалось переименовать временный файл в %s" +#: transport.c:62 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n" + +#: transport.c:151 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "транспорт: неправильный параметр глубины «%s»" + +#: transport.c:771 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n" + +#: transport.c:775 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n" + +#: transport.c:783 +msgid "Aborting." +msgstr "Прерываю." + #: transport-helper.c:1041 #, c-format msgid "Could not read ref %s" @@ -1781,7 +2102,7 @@ msgstr "Не удалось прочитать ссылку %s" #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you can switch branches." +"%%sPlease commit your changes or stash them before you switch branches." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток." #: unpack-trees.c:66 @@ -1795,7 +2116,7 @@ msgstr "Ваши локальные изменения в указанных ф #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you can merge." +"%%sPlease commit your changes or stash them before you merge." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток." #: unpack-trees.c:71 @@ -1809,7 +2130,7 @@ msgstr "Ваши локальные изменения в указанных ф #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you can %s." +"%%sPlease commit your changes or stash them before you %s." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s." #: unpack-trees.c:76 @@ -1830,7 +2151,7 @@ msgstr "Обновление указанных каталогов привед #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." #: unpack-trees.c:87 @@ -1844,7 +2165,7 @@ msgstr "Указанные неотслеживаемые файлы в рабо #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." #: unpack-trees.c:92 @@ -1858,7 +2179,7 @@ msgstr "Указанные неотслеживаемые файлы в рабо #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s." #: unpack-trees.c:97 @@ -1872,7 +2193,7 @@ msgstr "Указанные неотслеживаемые файлы в рабо #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." #: unpack-trees.c:104 @@ -1886,7 +2207,7 @@ msgstr "Указанные неотслеживаемые файлы в рабо #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." #: unpack-trees.c:109 @@ -1900,7 +2221,7 @@ msgstr "Указанные неотслеживаемые файлы в рабо #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s." #: unpack-trees.c:114 @@ -1974,43 +2295,43 @@ msgstr "неправильный номер порта" msgid "invalid '..' path segment" msgstr "неправильная часть пути «..»" -#: wrapper.c:222 wrapper.c:381 +#: worktree.c:282 +#, c-format +msgid "failed to read '%s'" +msgstr "не удалось прочитать «%s»" + +#: wrapper.c:222 wrapper.c:392 #, c-format msgid "could not open '%s' for reading and writing" msgstr "не удалось открыть «%s» для чтения и записи" -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 #, c-format msgid "could not open '%s' for writing" msgstr "не удалось открыть «%s» для записи" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "не удалось открыть «%s» для чтения" -#: wrapper.c:594 wrapper.c:615 +#: wrapper.c:605 wrapper.c:626 #, c-format msgid "unable to access '%s'" msgstr "«%s» недоступно" -#: wrapper.c:623 +#: wrapper.c:634 msgid "unable to get current working directory" msgstr "не удалось получить текущий рабочий каталог" -#: wrapper.c:650 -#, c-format -msgid "could not open %s for writing" -msgstr "не удалось открыть «%s» для записи" - -#: wrapper.c:661 builtin/am.c:410 +#: wrapper.c:658 #, c-format msgid "could not write to %s" msgstr "не удалось записать в %s" -#: wrapper.c:667 +#: wrapper.c:660 #, c-format msgid "could not close %s" msgstr "не удалось закрыть %s" @@ -2040,11 +2361,11 @@ msgstr " (используйте «git add/rm <файл>…», чтобы по msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:198 wt-status.c:881 +#: wt-status.c:198 wt-status.c:882 msgid "Changes to be committed:" msgstr "Изменения, которые будут включены в коммит:" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:216 wt-status.c:891 msgid "Changes not staged for commit:" msgstr "Изменения, которые не в индексе для коммита:" @@ -2099,11 +2420,6 @@ msgstr "оба добавлены:" msgid "both modified:" msgstr "оба измены:" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "ошибка: необработанный статус не слитых изменений %x" - #: wt-status.c:274 msgid "new file:" msgstr "новый файл:" @@ -2148,66 +2464,65 @@ msgstr "изменено содержимое, " msgid "untracked content, " msgstr "неотслеживаемое содержимое, " -#: wt-status.c:391 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "ошибка: необработанный статус изменений %c" - -#: wt-status.c:755 +#: wt-status.c:756 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:757 +#: wt-status.c:758 msgid "Submodule changes to be committed:" msgstr "Изменения в подмодулях, которые будут закоммичены:" -#: wt-status.c:838 +#: wt-status.c:839 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено." -#: wt-status.c:949 +#: wt-status.c:950 msgid "You have unmerged paths." msgstr "У вас есть не слитые пути." -#: wt-status.c:952 +#: wt-status.c:953 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запустите «git commit»)" -#: wt-status.c:956 +#: wt-status.c:955 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)" + +#: wt-status.c:960 msgid "All conflicts fixed but you are still merging." msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." -#: wt-status.c:959 +#: wt-status.c:963 msgid " (use \"git commit\" to conclude merge)" msgstr " (используйте «git commit», чтобы завершить слияние)" -#: wt-status.c:969 +#: wt-status.c:973 msgid "You are in the middle of an am session." msgstr "Вы в процессе сессии am." -#: wt-status.c:972 +#: wt-status.c:976 msgid "The current patch is empty." msgstr "Текущий патч пустой." -#: wt-status.c:976 +#: wt-status.c:980 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запустите «git am --continue»)" -#: wt-status.c:978 +#: wt-status.c:982 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" -#: wt-status.c:980 +#: wt-status.c:984 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" -#: wt-status.c:1105 +#: wt-status.c:1109 msgid "No commands done." msgstr "Команды не выполнены." -#: wt-status.c:1108 +#: wt-status.c:1112 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" @@ -2216,16 +2531,16 @@ msgstr[1] "Последняя команда выполнена (%d команд msgstr[2] "Последняя команда выполнена (%d команд выполнено):" msgstr[3] "Последняя команда выполнена (%d команд выполнено):" -#: wt-status.c:1119 +#: wt-status.c:1123 #, c-format msgid " (see more in file %s)" msgstr " (смотрите дополнительно в файле %s)" -#: wt-status.c:1124 +#: wt-status.c:1128 msgid "No commands remaining." msgstr "Команд больше не осталось." -#: wt-status.c:1127 +#: wt-status.c:1131 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -2234,150 +2549,150 @@ msgstr[1] "Следующая команда для выполнения (%d к msgstr[2] "Следующая команда для выполнения (%d команд осталось):" msgstr[3] "Следующая команда для выполнения (%d команд осталось):" -#: wt-status.c:1135 +#: wt-status.c:1139 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)" -#: wt-status.c:1148 +#: wt-status.c:1152 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Вы сейчас перемещаете ветку «%s» над «%s»." -#: wt-status.c:1153 +#: wt-status.c:1157 msgid "You are currently rebasing." msgstr "Вы сейчас перемещаете ветку." -#: wt-status.c:1167 +#: wt-status.c:1171 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)" -#: wt-status.c:1169 +#: wt-status.c:1173 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)" -#: wt-status.c:1171 +#: wt-status.c:1175 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)" -#: wt-status.c:1177 +#: wt-status.c:1181 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (все конфликты разрешены: запустите «git rebase --continue»)" -#: wt-status.c:1181 +#: wt-status.c:1185 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1186 +#: wt-status.c:1190 msgid "You are currently splitting a commit during a rebase." msgstr "Вы сейчас разделяете коммит при перемещении ветки." -#: wt-status.c:1189 +#: wt-status.c:1193 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)" -#: wt-status.c:1193 +#: wt-status.c:1197 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1198 +#: wt-status.c:1202 msgid "You are currently editing a commit during a rebase." msgstr "Вы сейчас редактируете коммит при перемещении ветки." -#: wt-status.c:1201 +#: wt-status.c:1205 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)" -#: wt-status.c:1203 +#: wt-status.c:1207 msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)" -#: wt-status.c:1213 +#: wt-status.c:1217 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Вы копируете коммит %s." -#: wt-status.c:1218 +#: wt-status.c:1222 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)" -#: wt-status.c:1221 +#: wt-status.c:1225 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)" -#: wt-status.c:1223 +#: wt-status.c:1227 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)" -#: wt-status.c:1232 +#: wt-status.c:1236 #, c-format msgid "You are currently reverting commit %s." msgstr "Вы сейчас обращаете изменения коммита %s." -#: wt-status.c:1237 +#: wt-status.c:1241 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (разрешите конфликты, затем запустите «git revert --continue»)" -#: wt-status.c:1240 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (все конфликты разрешены: запустите «git revert --continue»)" -#: wt-status.c:1242 +#: wt-status.c:1246 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)" -#: wt-status.c:1253 +#: wt-status.c:1257 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»." -#: wt-status.c:1257 +#: wt-status.c:1261 msgid "You are currently bisecting." msgstr "Вы сейчас в процессе двоичного поиска." -#: wt-status.c:1260 +#: wt-status.c:1264 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" -#: wt-status.c:1460 +#: wt-status.c:1464 msgid "On branch " msgstr "На ветке " -#: wt-status.c:1466 +#: wt-status.c:1470 msgid "interactive rebase in progress; onto " msgstr "интерактивное перемещение в процессе; над " -#: wt-status.c:1468 +#: wt-status.c:1472 msgid "rebase in progress; onto " msgstr "перемещение в процессе; над " -#: wt-status.c:1473 +#: wt-status.c:1477 msgid "HEAD detached at " msgstr "HEAD отделён на " -#: wt-status.c:1475 +#: wt-status.c:1479 msgid "HEAD detached from " msgstr "HEAD отделён начиная с " -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "Not currently on any branch." msgstr "Сейчас ни на одной из веток" -#: wt-status.c:1496 +#: wt-status.c:1500 msgid "Initial commit" msgstr "Начальный коммит" -#: wt-status.c:1510 +#: wt-status.c:1514 msgid "Untracked files" msgstr "Неотслеживаемые файлы" -#: wt-status.c:1512 +#: wt-status.c:1516 msgid "Ignored files" msgstr "Игнорируемые файлы" -#: wt-status.c:1516 +#: wt-status.c:1520 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2385,78 +2700,78 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)." -#: wt-status.c:1522 +#: wt-status.c:1526 #, c-format msgid "Untracked files not listed%s" msgstr "Неотслеживаемые файлы не показаны%s" -#: wt-status.c:1524 +#: wt-status.c:1528 msgid " (use -u option to show untracked files)" msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)" -#: wt-status.c:1530 +#: wt-status.c:1534 msgid "No changes" msgstr "Нет изменений" -#: wt-status.c:1535 +#: wt-status.c:1539 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n" -#: wt-status.c:1538 +#: wt-status.c:1542 #, c-format msgid "no changes added to commit\n" msgstr "нет изменений добавленных для коммита\n" -#: wt-status.c:1541 +#: wt-status.c:1545 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n" -#: wt-status.c:1544 +#: wt-status.c:1548 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" -#: wt-status.c:1547 +#: wt-status.c:1551 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n" -#: wt-status.c:1550 wt-status.c:1555 +#: wt-status.c:1554 wt-status.c:1559 #, c-format msgid "nothing to commit\n" msgstr "нечего коммитить\n" -#: wt-status.c:1553 +#: wt-status.c:1557 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n" -#: wt-status.c:1557 +#: wt-status.c:1561 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" -#: wt-status.c:1664 +#: wt-status.c:1668 msgid "Initial commit on " msgstr "Начальный коммит на " -#: wt-status.c:1668 +#: wt-status.c:1672 msgid "HEAD (no branch)" msgstr "HEAD (нет ветки)" -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "gone" msgstr "исчез" -#: wt-status.c:1699 wt-status.c:1707 +#: wt-status.c:1703 wt-status.c:1711 msgid "behind " msgstr "позади" -#: wt-status.c:1702 wt-status.c:1705 +#: wt-status.c:1706 wt-status.c:1709 msgid "ahead " msgstr "впереди " @@ -2474,583 +2789,597 @@ msgstr "git add [<опции>] [--] <спецификация-пути>…" msgid "unexpected diff status %c" msgstr "неожиданный статус различий %c" -#: builtin/add.c:70 builtin/commit.c:280 +#: builtin/add.c:71 builtin/commit.c:281 msgid "updating files failed" msgstr "сбой при обновлении файлов" -#: builtin/add.c:80 +#: builtin/add.c:81 #, c-format msgid "remove '%s'\n" msgstr "удалить «%s»\n" -#: builtin/add.c:134 +#: builtin/add.c:136 msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" -#: builtin/add.c:194 builtin/rev-parse.c:811 +#: builtin/add.c:196 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Не удалось прочитать индекс" -#: builtin/add.c:205 +#: builtin/add.c:207 #, c-format msgid "Could not open '%s' for writing." msgstr "Не удалось открыть «%s» для записи." -#: builtin/add.c:209 +#: builtin/add.c:211 msgid "Could not write patch" msgstr "Не удалось записать патч" -#: builtin/add.c:212 +#: builtin/add.c:214 msgid "editing patch failed" msgstr "сбой при редактировании патча" -#: builtin/add.c:215 +#: builtin/add.c:217 #, c-format msgid "Could not stat '%s'" msgstr "Не удалось выполнить stat для «%s»" -#: builtin/add.c:217 +#: builtin/add.c:219 msgid "Empty patch. Aborted." msgstr "Пустой патч. Операция прервана." -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not apply '%s'" msgstr "Не удалось применить «%s»" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" -#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 +#: 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 msgid "dry run" msgstr "пробный запуск" -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 +#: 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:252 +#: builtin/add.c:256 msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" -#: builtin/add.c:254 +#: builtin/add.c:258 msgid "edit current diff and apply" msgstr "отредактировать текущий файл различий и применить его" -#: builtin/add.c:255 +#: builtin/add.c:259 msgid "allow adding otherwise ignored files" msgstr "разрешить добавление игнорируемых иначе файлов" -#: builtin/add.c:256 +#: builtin/add.c:260 msgid "update tracked files" msgstr "обновить отслеживаемые файлы" -#: builtin/add.c:257 +#: builtin/add.c:261 msgid "record only the fact that the path will be added later" msgstr "записать только факт, что путь будет добавлен позже" -#: builtin/add.c:258 +#: builtin/add.c:262 msgid "add changes from all tracked and untracked files" msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" -#: builtin/add.c:261 +#: builtin/add.c:265 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" -#: builtin/add.c:263 +#: builtin/add.c:267 msgid "don't add, only refresh the index" msgstr "не добавлять, только обновить индекс" -#: builtin/add.c:264 +#: builtin/add.c:268 msgid "just skip files which cannot be added because of errors" msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" -#: builtin/add.c:265 +#: builtin/add.c:269 msgid "check if - even missing - files are ignored in dry run" msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске" -#: builtin/add.c:287 +#: builtin/add.c:270 builtin/update-index.c:958 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:270 builtin/update-index.c:959 +msgid "override the executable bit of the listed files" +msgstr "переопределить бит выполнения на указанных файлах" + +#: builtin/add.c:292 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Используйте -f, если вы действительно хотите добавить их.\n" -#: builtin/add.c:294 +#: builtin/add.c:300 msgid "adding files failed" msgstr "ошибка при добавлении файлов" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "-A and -u are mutually incompatible" msgstr "-A и -u нельзя использовать одновременно" -#: builtin/add.c:337 +#: builtin/add.c:343 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run" #: builtin/add.c:352 #, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "параметр --chmod «%s» должен быть -x или +x" + +#: builtin/add.c:367 +#, c-format msgid "Nothing specified, nothing added.\n" msgstr "Ничего не указано, ничего не добавлено.\n" -#: builtin/add.c:353 +#: builtin/add.c:368 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Возможно, вы имели в виду «git add .»?\n" -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: 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/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 #: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "файл индекса поврежден" -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 +#: 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:256 builtin/commit.c:749 builtin/merge.c:1089 +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 #, c-format msgid "could not read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/am.c:430 +#: builtin/am.c:426 msgid "could not parse author script" msgstr "не удалось разобрать сценарий авторства" -#: builtin/am.c:507 +#: builtin/am.c:503 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "«%s» был удален перехватчиком applypatch-msg" -#: builtin/am.c:548 builtin/notes.c:300 +#: builtin/am.c:544 builtin/notes.c:301 #, c-format msgid "Malformed input line: '%s'." msgstr "Неправильная строка ввода: «%s»." -#: builtin/am.c:585 builtin/notes.c:315 +#: builtin/am.c:581 builtin/notes.c:316 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Не удалось скопировать заметку из «%s» в «%s»" -#: builtin/am.c:611 +#: builtin/am.c:607 msgid "fseek failed" msgstr "сбой при выполнении fseek" -#: builtin/am.c:788 +#: builtin/am.c:787 #, c-format msgid "could not parse patch '%s'" msgstr "не удалось разобрать патч «%s»" -#: builtin/am.c:853 +#: builtin/am.c:852 msgid "Only one StGIT patch series can be applied at once" msgstr "Только серия патчей StGIT может быть применена за раз" -#: builtin/am.c:900 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "недопустимая метка даты/времени" -#: builtin/am.c:903 builtin/am.c:911 +#: builtin/am.c:902 builtin/am.c:910 msgid "invalid Date line" msgstr "недопустимая строка даты" -#: builtin/am.c:908 +#: builtin/am.c:907 msgid "invalid timezone offset" msgstr "недопустимое смещение часового пояса" -#: builtin/am.c:995 +#: builtin/am.c:996 msgid "Patch format detection failed." msgstr "Сбой определения формата патча." -#: builtin/am.c:1000 builtin/clone.c:380 +#: builtin/am.c:1001 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/am.c:1004 +#: builtin/am.c:1005 msgid "Failed to split patches." msgstr "Не удалось разделить патчи на части." -#: builtin/am.c:1136 builtin/commit.c:365 +#: builtin/am.c:1137 builtin/commit.c:366 msgid "unable to write index file" msgstr "не удалось записать индекс" -#: builtin/am.c:1187 +#: builtin/am.c:1188 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." -#: builtin/am.c:1188 +#: builtin/am.c:1189 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." -#: builtin/am.c:1189 +#: builtin/am.c:1190 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»." -#: builtin/am.c:1327 +#: builtin/am.c:1328 msgid "Patch is empty. Was it split wrong?" msgstr "Патч пуст. Возможно, он был неправильно разделён?" -#: builtin/am.c:1401 builtin/log.c:1516 +#: builtin/am.c:1402 builtin/log.c:1543 #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" -#: builtin/am.c:1428 +#: builtin/am.c:1429 #, c-format msgid "unable to parse commit %s" msgstr "не удалось разобрать коммит %s" -#: builtin/am.c:1630 +#: builtin/am.c:1602 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." -#: builtin/am.c:1632 +#: builtin/am.c:1604 msgid "Using index info to reconstruct a base tree..." msgstr "Использую индекс для реконструкции базового дерева…" -#: builtin/am.c:1651 +#: builtin/am.c:1623 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." -#: builtin/am.c:1657 +#: builtin/am.c:1629 msgid "Falling back to patching base and 3-way merge..." msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" -#: builtin/am.c:1672 +#: builtin/am.c:1654 msgid "Failed to merge in the changes." msgstr "Не удалось слить изменения." -#: builtin/am.c:1696 builtin/merge.c:636 +#: builtin/am.c:1679 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree не удалось записать дерево" -#: builtin/am.c:1703 +#: builtin/am.c:1686 msgid "applying to an empty history" msgstr "применение к пустой истории" -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 -#: builtin/merge.c:866 +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 +#: builtin/merge.c:823 msgid "failed to write commit object" msgstr "сбой записи объекта коммита" -#: builtin/am.c:1748 builtin/am.c:1752 +#: builtin/am.c:1731 builtin/am.c:1735 #, c-format msgid "cannot resume: %s does not exist." msgstr "нельзя продолжнить: %s не существует " -#: builtin/am.c:1768 +#: builtin/am.c:1751 msgid "cannot be interactive without stdin connected to a terminal." msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." -#: builtin/am.c:1773 +#: builtin/am.c:1756 msgid "Commit Body is:" msgstr "Тело коммита:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1783 +#: builtin/am.c:1766 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: " -#: builtin/am.c:1833 +#: builtin/am.c:1816 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)" -#: builtin/am.c:1868 builtin/am.c:1940 +#: builtin/am.c:1853 builtin/am.c:1925 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1884 +#: builtin/am.c:1869 msgid "No changes -- Patch already applied." msgstr "Нет изменений — Патч уже применен." -#: builtin/am.c:1892 +#: builtin/am.c:1877 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка применения изменений на %s %.*s" -#: builtin/am.c:1898 +#: builtin/am.c:1883 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s" -#: builtin/am.c:1943 +#: builtin/am.c:1928 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." -#: builtin/am.c:1950 +#: builtin/am.c:1935 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?" -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Не удалось разобрать объект «%s»." -#: builtin/am.c:2110 +#: builtin/am.c:2095 msgid "failed to clean index" msgstr "не удалось очистить индекс" -#: builtin/am.c:2144 +#: builtin/am.c:2129 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" -#: builtin/am.c:2205 +#: builtin/am.c:2192 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправильное значение для --patch-format: %s" -#: builtin/am.c:2238 +#: builtin/am.c:2225 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2239 +#: builtin/am.c:2226 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "run interactively" msgstr "запустить в интерактивном режиме" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатиться к трехходовому слиянию, если нужно" -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 -#: builtin/repack.c:171 +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 +#: builtin/repack.c:172 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2252 +#: builtin/am.c:2239 msgid "add a Signed-off-by line to the commit message" msgstr "добавить строку Signed-off-by к сообщению коммита" -#: builtin/am.c:2255 +#: builtin/am.c:2242 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2257 +#: builtin/am.c:2244 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2259 +#: builtin/am.c:2246 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2261 +#: builtin/am.c:2248 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2263 +#: builtin/am.c:2250 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" -#: builtin/am.c:2266 +#: builtin/am.c:2253 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" -#: builtin/am.c:2269 +#: builtin/am.c:2256 msgid "strip everything before a scissors line" msgstr "обрезать все до строки обрезки" -#: builtin/am.c:2270 builtin/apply.c:4546 +#: builtin/am.c:2257 builtin/apply.c:4837 msgid "action" msgstr "действие" -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 -#: builtin/am.c:2298 +#: 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 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2279 builtin/apply.c:4570 +#: builtin/am.c:2266 builtin/apply.c:4861 msgid "root" msgstr "корень" -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: 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:404 builtin/submodule--helper.c:485 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 -#: builtin/submodule--helper.c:770 +#: 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:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 -#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 +#: 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 msgid "n" msgstr "n" -#: builtin/am.c:2291 builtin/apply.c:4514 +#: builtin/am.c:2278 builtin/apply.c:4805 msgid "num" msgstr "количество" -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "формат" -#: builtin/am.c:2295 +#: builtin/am.c:2282 msgid "format the patch(es) are in" msgstr "формат, в котором находятся патчи" -#: builtin/am.c:2301 +#: builtin/am.c:2288 msgid "override error message when patch failure occurs" msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения" -#: builtin/am.c:2303 +#: builtin/am.c:2290 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений после разрешения конфиликта" -#: builtin/am.c:2306 +#: builtin/am.c:2293 msgid "synonyms for --continue" msgstr "синоним для --continue" -#: builtin/am.c:2309 +#: builtin/am.c:2296 msgid "skip the current patch" msgstr "пропустить текущий патч" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "restore the original branch and abort the patching operation." msgstr "восстановить оригинальную ветку и отменить операцию применения изменений." -#: builtin/am.c:2316 +#: builtin/am.c:2303 msgid "lie about committer date" msgstr "соврать о дате коммитера" -#: builtin/am.c:2318 +#: builtin/am.c:2305 msgid "use current timestamp for author date" msgstr "использовать текущее время как время авторства" -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2321 +#: builtin/am.c:2308 msgid "GPG-sign commits" msgstr "подписать коммиты с помощью GPG" -#: builtin/am.c:2324 +#: builtin/am.c:2311 msgid "(internal use for git-rebase)" msgstr "(внутреннее использование для git-rebase)" -#: builtin/am.c:2339 +#: builtin/am.c:2326 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." -#: builtin/am.c:2346 +#: builtin/am.c:2333 msgid "failed to read the index" msgstr "сбой чтения индекса" -#: builtin/am.c:2361 +#: builtin/am.c:2348 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." -#: builtin/am.c:2385 +#: builtin/am.c:2372 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2391 +#: builtin/am.c:2378 msgid "Resolve operation not in progress, we are not resuming." msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." -#: builtin/apply.c:59 +#: builtin/apply.c:122 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<опции>] [<патч>…]" -#: builtin/apply.c:111 +#: builtin/apply.c:153 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "неопознанная опция для пробелов «%s»" -#: builtin/apply.c:126 +#: builtin/apply.c:169 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "неопознанная опция для игнорирования пробелов «%s»" -#: builtin/apply.c:818 +#: builtin/apply.c:854 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Не удалось подготовить регулярное выражение для метки времени %s" -#: builtin/apply.c:827 +#: builtin/apply.c:863 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec возвратил %d для ввода: %s" -#: builtin/apply.c:908 +#: builtin/apply.c:947 #, c-format msgid "unable to find filename in patch at line %d" msgstr "не удалось найти имя файла в строке патча %d" -#: builtin/apply.c:937 +#: builtin/apply.c:984 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d" -#: builtin/apply.c:942 +#: builtin/apply.c:989 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d" -#: builtin/apply.c:943 +#: builtin/apply.c:990 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d" -#: builtin/apply.c:949 +#: builtin/apply.c:995 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" -#: builtin/apply.c:1406 +#: builtin/apply.c:1489 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: не ожидаемая строка: %.*s" -#: builtin/apply.c:1463 +#: builtin/apply.c:1550 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "фрагмент изменений без заголовка на строке %d: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -3063,65 +3392,65 @@ msgstr[1] "заголовок git diff не нашел информацию об msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" -#: builtin/apply.c:1646 +#: builtin/apply.c:1743 msgid "new file depends on old contents" msgstr "новый файл зависит от старого содержимого" -#: builtin/apply.c:1648 +#: builtin/apply.c:1745 msgid "deleted file still has contents" msgstr "удаленный файл все еще имеет содержимое" -#: builtin/apply.c:1674 +#: builtin/apply.c:1774 #, c-format msgid "corrupt patch at line %d" msgstr "патч поврежден на строке %d" -#: builtin/apply.c:1710 +#: builtin/apply.c:1810 #, c-format msgid "new file %s depends on old contents" msgstr "новый файл %s зависит от старого содержимого" -#: builtin/apply.c:1712 +#: builtin/apply.c:1812 #, c-format msgid "deleted file %s still has contents" msgstr "удаленный файл %s все еще имеет содержимое" -#: builtin/apply.c:1715 +#: builtin/apply.c:1815 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** предупреждение: файл %s становится пустым, но не удаляется" -#: builtin/apply.c:1861 +#: builtin/apply.c:1962 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "поврежденный двоичный патч на строке %d: %.*s" -#: builtin/apply.c:1895 +#: builtin/apply.c:1999 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неопознанный двоичный патч на строке %d" -#: builtin/apply.c:2048 +#: builtin/apply.c:2154 #, c-format msgid "patch with only garbage at line %d" msgstr "патч с мусором на строке %d" -#: builtin/apply.c:2138 +#: builtin/apply.c:2244 #, c-format msgid "unable to read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: builtin/apply.c:2142 +#: builtin/apply.c:2248 #, c-format msgid "unable to open or read %s" msgstr "не удалось открыть или прочесть %s" -#: builtin/apply.c:2775 +#: builtin/apply.c:2901 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало строки: «%c»" -#: builtin/apply.c:2894 +#: 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)." @@ -3130,177 +3459,172 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." -#: builtin/apply.c:2906 +#: builtin/apply.c:3032 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" -#: builtin/apply.c:2912 +#: builtin/apply.c:3038 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "при поиске:\n%.*s" -#: builtin/apply.c:2932 +#: builtin/apply.c:3060 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча для «%s»" -#: builtin/apply.c:3033 +#: builtin/apply.c:3163 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалось применить двоичный патч к «%s»" -#: builtin/apply.c:3039 +#: builtin/apply.c:3169 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" -#: builtin/apply.c:3060 +#: builtin/apply.c:3190 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка применения изменений: %s:%ld" -#: builtin/apply.c:3184 +#: builtin/apply.c:3314 #, c-format msgid "cannot checkout %s" msgstr "не удалось переключить состояние на %s" -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 -#, c-format -msgid "read of %s failed" -msgstr "ошибка чтения %s" - -#: builtin/apply.c:3237 +#: builtin/apply.c:3370 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за символической ссылкой" -#: builtin/apply.c:3265 builtin/apply.c:3487 +#: builtin/apply.c:3399 builtin/apply.c:3630 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: builtin/apply.c:3346 builtin/apply.c:3501 +#: builtin/apply.c:3482 builtin/apply.c:3644 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индексе" -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3355 builtin/apply.c:3509 +#: builtin/apply.c:3491 builtin/apply.c:3652 #, c-format msgid "%s: does not match index" msgstr "%s: не совпадает с индексом" -#: builtin/apply.c:3457 +#: builtin/apply.c:3597 msgid "removal patch leaves file contents" msgstr "патч удаления не удалил содержимое файла" -#: builtin/apply.c:3526 +#: builtin/apply.c:3669 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: builtin/apply.c:3528 +#: builtin/apply.c:3671 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидался %o" -#: builtin/apply.c:3687 builtin/apply.c:3689 +#: builtin/apply.c:3822 builtin/apply.c:3824 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: builtin/apply.c:3744 +#: builtin/apply.c:3879 #, c-format msgid "%s: already exists in index" msgstr "%s: уже содержится в индексе" -#: builtin/apply.c:3747 +#: builtin/apply.c:3882 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже содержится в рабочем каталоге" -#: builtin/apply.c:3767 +#: builtin/apply.c:3902 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" -#: builtin/apply.c:3772 +#: builtin/apply.c:3907 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s" -#: builtin/apply.c:3792 +#: builtin/apply.c:3927 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находится за символической ссылкой" -#: builtin/apply.c:3796 +#: builtin/apply.c:3931 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалось применить патч" -#: builtin/apply.c:3810 +#: builtin/apply.c:3945 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "сбой make_cache_entry для пути «%s»" -#: builtin/apply.c:4046 +#: builtin/apply.c:4182 #, c-format msgid "unable to remove %s from index" msgstr "не удалось удалить %s из индекса" -#: builtin/apply.c:4075 +#: builtin/apply.c:4215 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч для подмодуля %s" -#: builtin/apply.c:4079 +#: builtin/apply.c:4219 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалось выполнить stat для созданного файла «%s»" -#: builtin/apply.c:4084 +#: builtin/apply.c:4224 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалось создать вспомогательный файл для созданного файла %s" -#: builtin/apply.c:4087 builtin/apply.c:4195 +#: builtin/apply.c:4227 builtin/apply.c:4340 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалось создать запись в кэше для %s" -#: builtin/apply.c:4120 +#: builtin/apply.c:4260 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: builtin/apply.c:4169 +#: builtin/apply.c:4313 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалось записать файл «%s» с режимом доступа %o" -#: builtin/apply.c:4256 +#: builtin/apply.c:4403 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: builtin/apply.c:4264 +#: builtin/apply.c:4411 msgid "internal error" msgstr "внутренняя ошибка" -#: builtin/apply.c:4267 +#: builtin/apply.c:4414 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -3309,174 +3633,174 @@ msgstr[1] "Применение патча %%s с %d отказами…" msgstr[2] "Применение патча %%s с %d отказами…" msgstr[3] "Применение патча %%s с %d отказами…" -#: builtin/apply.c:4277 +#: builtin/apply.c:4424 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "усечение имени .rej файла до %.*s.rej" -#: builtin/apply.c:4285 +#: builtin/apply.c:4432 #, c-format msgid "cannot open %s: %s" msgstr "не удалось открыть %s: %s" -#: builtin/apply.c:4298 +#: builtin/apply.c:4445 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок №%d применен без ошибок." -#: builtin/apply.c:4301 +#: builtin/apply.c:4448 #, c-format msgid "Rejected hunk #%d." msgstr "Блок №%d отклонен." -#: builtin/apply.c:4387 +#: builtin/apply.c:4537 #, c-format msgid "Skipped patch '%s'." msgstr "Патч «%s» пропущен." -#: builtin/apply.c:4395 +#: builtin/apply.c:4545 msgid "unrecognized input" msgstr "не распознанный ввод" -#: builtin/apply.c:4406 +#: builtin/apply.c:4556 msgid "unable to read index file" msgstr "не удалось прочитать файл индекса" -#: builtin/apply.c:4509 +#: builtin/apply.c:4701 +msgid "--3way outside a repository" +msgstr "--3way вне репозитория" + +#: builtin/apply.c:4709 +msgid "--index outside a repository" +msgstr "--index вне репозитория" + +#: builtin/apply.c:4712 +msgid "--cached outside a repository" +msgstr "--cached вне репозитория" + +#: builtin/apply.c:4745 +#, c-format +msgid "can't open patch '%s'" +msgstr "не удалось открыть патч «%s»" + +#: builtin/apply.c:4760 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "пропущена %d ошибка в пробельных символах" +msgstr[1] "пропущено %d ошибки в пробельных символах" +msgstr[2] "пропущено %d ошибок в пробельных символах" +msgstr[3] "пропущено %d ошибок в пробельных символах" + +#: builtin/apply.c:4766 builtin/apply.c:4776 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d строка добавила ошибки в пробельных символах." +msgstr[1] "%d строки добавили ошибки в пробельных символах." +msgstr[2] "%d строк добавили ошибки в пробельных символах." +msgstr[3] "%d строк добавили ошибки в пробельных символах." + +#: builtin/apply.c:4800 msgid "don't apply changes matching the given path" msgstr "не применять изменения по указанному пути" -#: builtin/apply.c:4512 +#: builtin/apply.c:4803 msgid "apply changes matching the given path" msgstr "применять изменения по указанному пути" -#: builtin/apply.c:4515 +#: builtin/apply.c:4806 msgid "remove <num> leading slashes from traditional diff paths" msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" -#: builtin/apply.c:4518 +#: builtin/apply.c:4809 msgid "ignore additions made by the patch" msgstr "игнорировать добавления, сделанные этим патчем" -#: builtin/apply.c:4520 +#: builtin/apply.c:4811 msgid "instead of applying the patch, output diffstat for the input" msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" -#: builtin/apply.c:4524 +#: builtin/apply.c:4815 msgid "show number of added and deleted lines in decimal notation" msgstr "показать количество добавленных и удаленных строк в десятичном представлении" -#: builtin/apply.c:4526 +#: builtin/apply.c:4817 msgid "instead of applying the patch, output a summary for the input" msgstr "вместо применения патча вывести статистику изменений для ввода" -#: builtin/apply.c:4528 +#: builtin/apply.c:4819 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вместо применения патча проверить подходит ли он" -#: builtin/apply.c:4530 +#: builtin/apply.c:4821 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применяется к текущему индексу" -#: builtin/apply.c:4532 +#: builtin/apply.c:4823 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменяя рабочий каталог" -#: builtin/apply.c:4534 +#: builtin/apply.c:4825 msgid "accept a patch that touches outside the working area" msgstr "принять патч, который затрагивает файлы за рабочим каталогом" -#: builtin/apply.c:4536 +#: builtin/apply.c:4827 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (используйте с --stat/--summary/--check)" -#: builtin/apply.c:4538 +#: builtin/apply.c:4829 msgid "attempt three-way merge if a patch does not apply" msgstr "попытаться сделать трехходовое слияние, если патч не применяется" -#: builtin/apply.c:4540 +#: builtin/apply.c:4831 msgid "build a temporary index based on embedded index information" msgstr "построить временный индекс, основанный на встроенной информации об индексе" -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: 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:4545 +#: builtin/apply.c:4836 msgid "ensure at least <n> lines of context match" msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" -#: builtin/apply.c:4547 +#: builtin/apply.c:4838 msgid "detect new or modified lines that have whitespace errors" msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" -#: builtin/apply.c:4550 builtin/apply.c:4553 +#: builtin/apply.c:4841 builtin/apply.c:4844 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать изменения в пробельных символах при поиске контекста" -#: builtin/apply.c:4556 +#: builtin/apply.c:4847 msgid "apply the patch in reverse" msgstr "применить патч с обращением изменений" -#: builtin/apply.c:4558 +#: builtin/apply.c:4849 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной строки контекста" -#: builtin/apply.c:4560 +#: builtin/apply.c:4851 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" -#: builtin/apply.c:4562 +#: builtin/apply.c:4853 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеся блоки изменений" -#: builtin/apply.c:4565 +#: builtin/apply.c:4856 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" -#: builtin/apply.c:4568 +#: builtin/apply.c:4859 msgid "do not trust the line counts in the hunk headers" msgstr "не доверять количеству строк из заголовка блока изменений" -#: builtin/apply.c:4571 +#: builtin/apply.c:4862 msgid "prepend <root> to all filenames" msgstr "добавить <корень> спереди ко всем именам файлов" -#: builtin/apply.c:4593 -msgid "--3way outside a repository" -msgstr "--3way вне репозитория" - -#: builtin/apply.c:4601 -msgid "--index outside a repository" -msgstr "--index вне репозитория" - -#: builtin/apply.c:4604 -msgid "--cached outside a repository" -msgstr "--cached вне репозитория" - -#: builtin/apply.c:4623 -#, c-format -msgid "can't open patch '%s'" -msgstr "не удалось открыть патч «%s»" - -#: builtin/apply.c:4637 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "пропущена %d ошибка в пробельных символах" -msgstr[1] "пропущено %d ошибки в пробельных символах" -msgstr[2] "пропущено %d ошибок в пробельных символах" -msgstr[3] "пропущено %d ошибок в пробельных символах" - -#: builtin/apply.c:4643 builtin/apply.c:4653 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d строка добавила ошибки в пробельных символах." -msgstr[1] "%d строки добавили ошибки в пробельных символах." -msgstr[2] "%d строк добавили ошибки в пробельных символах." -msgstr[3] "%d строк добавили ошибки в пробельных символах." - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -3532,103 +3856,103 @@ msgstr "git blame [<опции>] [<опции-редакции>] [<редакц msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<опции-rev-list> документированы в git-rev-list(1)" -#: builtin/blame.c:1782 +#: builtin/blame.c:1781 msgid "Blaming lines" msgstr "Просмотр авторов строк" -#: builtin/blame.c:2531 +#: builtin/blame.c:2536 msgid "Show blame entries as we find them, incrementally" msgstr "Показать записи авторства постепенно, в процессе нахождения" -#: builtin/blame.c:2532 +#: builtin/blame.c:2537 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2538 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)" -#: builtin/blame.c:2534 +#: builtin/blame.c:2539 msgid "Show work cost statistics" msgstr "Показать статистику расходов на выполнение запроса" -#: builtin/blame.c:2535 +#: builtin/blame.c:2540 msgid "Force progress reporting" msgstr "Принудительно выводить прогресс выполнения" -#: builtin/blame.c:2536 +#: builtin/blame.c:2541 msgid "Show output score for blame entries" msgstr "Показать оценку для записей авторства" -#: builtin/blame.c:2537 +#: builtin/blame.c:2542 msgid "Show original filename (Default: auto)" msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2543 msgid "Show original linenumber (Default: off)" msgstr "Показать оригинальные номера строк (По умолчанию: отключено)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2544 msgid "Show in a format designed for machine consumption" msgstr "Показать в формате для программного разбора" -#: builtin/blame.c:2540 +#: builtin/blame.c:2545 msgid "Show porcelain format with per-line commit information" msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите" -#: builtin/blame.c:2541 +#: builtin/blame.c:2546 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2547 msgid "Show raw timestamp (Default: off)" msgstr "Показать необработанные временные метки (По умолчанию: отключено)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2548 msgid "Show long commit SHA1 (Default: off)" msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2549 msgid "Suppress author name and timestamp (Default: off)" msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2550 msgid "Show author email instead of name (Default: off)" msgstr "Показать почту автора вместо имени (По умолчанию: отключено)" -#: builtin/blame.c:2546 +#: builtin/blame.c:2551 msgid "Ignore whitespace differences" msgstr "Игнорировать различия в пробелах" -#: builtin/blame.c:2547 +#: builtin/blame.c:2552 msgid "Spend extra cycles to find better match" msgstr "Потратить больше времени, для нахождения лучших совпадений" -#: builtin/blame.c:2548 +#: builtin/blame.c:2553 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" -#: builtin/blame.c:2549 +#: builtin/blame.c:2554 msgid "Use <file>'s contents as the final image" msgstr "Использовать содержимое <файла> как финальный снимок" -#: builtin/blame.c:2550 builtin/blame.c:2551 +#: builtin/blame.c:2555 builtin/blame.c:2556 msgid "score" msgstr "мин-длина" -#: builtin/blame.c:2550 +#: builtin/blame.c:2555 msgid "Find line copies within and across files" msgstr "Найти копирование строк в пределах и между файлами" -#: builtin/blame.c:2551 +#: builtin/blame.c:2556 msgid "Find line movements within and across files" msgstr "Найти перемещения строк в пределах и между файлами" -#: builtin/blame.c:2552 +#: builtin/blame.c:2557 msgid "n,m" msgstr "начало,конец" -#: builtin/blame.c:2552 +#: builtin/blame.c:2557 msgid "Process only line range n,m, counting from 1" msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" @@ -3638,7 +3962,7 @@ msgstr "Обработать только строки в диапазоне н #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2641 +#: builtin/blame.c:2649 msgid "4 years, 11 months ago" msgstr "4 года и 11 месяцев назад" @@ -3735,118 +4059,122 @@ msgstr "Внешняя отслеживаемая ветка %s удалена ( msgid "Deleted branch %s (was %s).\n" msgstr "Ветка %s удалена (была %s).\n" -#: builtin/branch.c:309 +#: builtin/branch.c:312 #, c-format msgid "[%s: gone]" msgstr "[%s: пропал]" -#: builtin/branch.c:314 +#: builtin/branch.c:317 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:319 +#: builtin/branch.c:322 #, c-format msgid "[%s: behind %d]" msgstr "[%s: позади %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:324 #, c-format msgid "[behind %d]" msgstr "[позади %d]" -#: builtin/branch.c:325 +#: builtin/branch.c:328 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: впереди %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:330 #, c-format msgid "[ahead %d]" msgstr "[впереди %d]" -#: builtin/branch.c:330 +#: builtin/branch.c:333 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: впереди %d, позади %d]" -#: builtin/branch.c:333 +#: builtin/branch.c:336 #, c-format msgid "[ahead %d, behind %d]" msgstr "[впереди %d, позади %d]" -#: builtin/branch.c:346 +#: builtin/branch.c:349 msgid " **** invalid ref ****" msgstr " **** недействительная ссылка ****" -#: builtin/branch.c:372 +#: builtin/branch.c:375 #, c-format msgid "(no branch, rebasing %s)" msgstr "(нет ветки, перемещение %s)" -#: builtin/branch.c:375 +#: builtin/branch.c:378 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(нет ветки, двоичный поиск начат на %s)" #. TRANSLATORS: make sure this matches #. "HEAD detached at " in wt-status.c -#: builtin/branch.c:381 +#: builtin/branch.c:384 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD отделён на %s)" #. TRANSLATORS: make sure this matches #. "HEAD detached from " in wt-status.c -#: builtin/branch.c:386 +#: builtin/branch.c:389 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD отделён начиная с %s)" -#: builtin/branch.c:390 +#: builtin/branch.c:393 msgid "(no branch)" msgstr "(нет ветки)" -#: builtin/branch.c:541 +#: builtin/branch.c:544 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Производится перемещение ветки %s на %s" -#: builtin/branch.c:545 +#: builtin/branch.c:548 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Производится двоичный поиск в ветке %s на %s" -#: builtin/branch.c:560 +#: builtin/branch.c:563 msgid "cannot rename the current branch while not on any." msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них." -#: builtin/branch.c:570 +#: builtin/branch.c:573 #, c-format msgid "Invalid branch name: '%s'" msgstr "Недействительное имя ветки: «%s»" -#: builtin/branch.c:587 +#: builtin/branch.c:590 msgid "Branch rename failed" msgstr "Сбой переименования ветки" -#: builtin/branch.c:591 +#: builtin/branch.c:594 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Переименована неправильно названная ветка «%s»" -#: builtin/branch.c:594 +#: builtin/branch.c:597 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Ветка переименована в %s, но HEAD не обновлен!" -#: builtin/branch.c:601 +#: builtin/branch.c:604 msgid "Branch is renamed, but update of config-file failed" msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации" -#: builtin/branch.c:623 -msgid "could not write branch description template" -msgstr "не удалось записать шаблон описания ветки" +#: builtin/branch.c:620 +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n" #: builtin/branch.c:651 msgid "Generic options" @@ -3948,8 +4276,8 @@ msgstr "ключ" msgid "field name to sort on" msgstr "имя поля, по которому выполнить сортировку" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 +#: 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/tag.c:369 msgid "object" msgstr "объект" @@ -4065,61 +4393,61 @@ msgstr "Требуется репозиторий для создания пак msgid "Need a repository to unbundle." msgstr "Требуется репозиторий для распаковки." -#: builtin/cat-file.c:428 +#: builtin/cat-file.c:443 msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-" "type]|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<тип>|--textconv) <объект>" -#: builtin/cat-file.c:429 +#: 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:466 +#: builtin/cat-file.c:481 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<тип> может быть одним из: blob, tree, commit, tag" -#: builtin/cat-file.c:467 +#: builtin/cat-file.c:482 msgid "show object type" msgstr "показать тип объекта" -#: builtin/cat-file.c:468 +#: builtin/cat-file.c:483 msgid "show object size" msgstr "показать размер объекта" -#: builtin/cat-file.c:470 +#: builtin/cat-file.c:485 msgid "exit with zero when there's no error" msgstr "выйти с нулевым кодом возврата, если нет ошибки" -#: builtin/cat-file.c:471 +#: builtin/cat-file.c:486 msgid "pretty-print object's content" msgstr "структурированный вывод содержимого объекта" -#: builtin/cat-file.c:473 +#: builtin/cat-file.c:488 msgid "for blob objects, run textconv on object's content" msgstr "запустить texconv на содержимом двоичных объектов " -#: builtin/cat-file.c:475 +#: builtin/cat-file.c:490 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать с повреждёнными объектами" -#: builtin/cat-file.c:476 +#: builtin/cat-file.c:491 msgid "buffer --batch output" msgstr "буфферировать вывод --batch" -#: builtin/cat-file.c:478 +#: builtin/cat-file.c:493 msgid "show info and content of objects fed from the standard input" msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:496 msgid "show info about objects fed from the standard input" msgstr "показать информацию об объектах, переданных из стандартного ввода" -#: builtin/cat-file.c:484 +#: builtin/cat-file.c:499 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:501 msgid "show all objects with --batch or --batch-check" msgstr "показать все объекты с опциями --batch или --batch-check" @@ -4147,7 +4475,7 @@ msgstr "прочитать имена файлов из стандартного msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -4237,9 +4565,9 @@ msgid "write the content to temporary files" msgstr "записать содержимое во временные файлы" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 -#: builtin/submodule--helper.c:774 +#: 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 msgid "string" msgstr "строка" @@ -4305,10 +4633,6 @@ msgstr "«%s» нельзя использовать одновременно с msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." -#: builtin/checkout.c:279 builtin/checkout.c:473 -msgid "corrupt index file" -msgstr "файл индекса поврежден" - #: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" @@ -4318,50 +4642,50 @@ msgstr "путь «%s» не слит" msgid "you need to resolve your current index first" msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" -#: builtin/checkout.c:622 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" -#: builtin/checkout.c:660 +#: builtin/checkout.c:664 msgid "HEAD is now at" msgstr "HEAD сейчас на" -#: builtin/checkout.c:664 builtin/clone.c:661 +#: builtin/checkout.c:668 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "не удалось обновить HEAD" -#: builtin/checkout.c:668 +#: builtin/checkout.c:672 #, c-format msgid "Reset branch '%s'\n" msgstr "Сброс ветки «%s»\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:675 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:679 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и сброс ветки «%s»\n" -#: builtin/checkout.c:677 builtin/checkout.c:1067 +#: builtin/checkout.c:681 builtin/checkout.c:1070 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:683 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:731 +#: builtin/checkout.c:734 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:737 +#: builtin/checkout.c:740 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4378,7 +4702,7 @@ msgstr[1] "Предупреждение: вы оставляете позади msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" -#: builtin/checkout.c:756 +#: builtin/checkout.c:759 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4397,162 +4721,162 @@ msgstr[1] "Если вы хотите сохранить их с помощью msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" -#: builtin/checkout.c:792 +#: builtin/checkout.c:795 msgid "internal error in revision walk" msgstr "внутренняя ошибка при хождении по редакциям" -#: builtin/checkout.c:796 +#: builtin/checkout.c:799 msgid "Previous HEAD position was" msgstr "Предыдущая позиция HEAD была" -#: builtin/checkout.c:823 builtin/checkout.c:1062 +#: builtin/checkout.c:826 builtin/checkout.c:1065 msgid "You are on a branch yet to be born" msgstr "Вы находитесь на еще не созданной ветке" -#: builtin/checkout.c:968 +#: builtin/checkout.c:971 #, c-format msgid "only one reference expected, %d given." msgstr "ожидается только одна ссылка, а передано %d." -#: builtin/checkout.c:1008 builtin/worktree.c:212 +#: builtin/checkout.c:1011 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "неправильная ссылка: %s" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1040 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ссылки: %s" -#: builtin/checkout.c:1076 +#: builtin/checkout.c:1079 msgid "paths cannot be used with switching branches" msgstr "нельзя использовать пути при переключении веток" -#: builtin/checkout.c:1079 builtin/checkout.c:1083 +#: builtin/checkout.c:1082 builtin/checkout.c:1086 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "нельзя использовать «%s» при переключении веток" -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 +#: builtin/checkout.c:1101 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» нельзя использовать одновременно с «%s»" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Нельзя переключить ветку на не коммит «%s»" -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 -#: builtin/worktree.c:325 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 +#: builtin/worktree.c:326 msgid "branch" msgstr "ветка" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1140 msgid "create and checkout a new branch" msgstr "создать и переключиться на новую ветку" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create/reset and checkout a branch" msgstr "создать/сбросить и перключиться на новую ветку" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1143 msgid "create reflog for new branch" msgstr "создать журнал ссылок для новой ветки" -#: builtin/checkout.c:1141 -msgid "detach the HEAD at named commit" +#: builtin/checkout.c:1144 builtin/worktree.c:328 +msgid "detach HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "set upstream info for new branch" msgstr "установить информацию о вышестоящей ветке для новой ветки" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "new-branch" msgstr "новая-ветка" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "new unparented branch" msgstr "новая ветка без родителей" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1148 msgid "checkout our version for unmerged files" msgstr "переключиться на нашу версию для не слитых файлов" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout their version for unmerged files" msgstr "переключиться на их версию для не слитых файлов" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "force checkout (throw away local modifications)" msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1153 msgid "perform a 3-way merge with the new branch" msgstr "выполнить трехходовое слияние с новой веткой" -#: builtin/checkout.c:1151 builtin/merge.c:230 +#: builtin/checkout.c:1154 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "обновить игнорируемые файлы (по умолчанию)" -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 msgid "style" msgstr "стиль" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1156 msgid "conflict style (merge or diff3)" msgstr "стиль конфликтов слияния (merge или diff3)" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1159 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать спецификаторы пути только частичными записями" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "second guess 'git checkout <no-such-branch>'" msgstr "пересмотр «git checkout <нет-такой-ветки>»" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "do not check if another worktree is holding the given ref" msgstr "не проверять, что другое дерево уже содержит указанную ссылку" -#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 +#: 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/send-pack.c:168 msgid "force progress reporting" msgstr "принудительно выводить прогресс" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1195 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B и --orphan нельзя использовать одновременно" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1212 msgid "--track needs a branch name" msgstr "--track требует имя ветки" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1217 msgid "Missing branch name; try -b" msgstr "Пропущено имя ветки; попробуйте -b" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1253 msgid "invalid path specification" msgstr "неправильная спецификация пути" -#: builtin/checkout.c:1257 +#: builtin/checkout.c:1260 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "Нельзя обновить пути и одновременно переключиться на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1265 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1266 +#: builtin/checkout.c:1269 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4685,7 +5009,7 @@ msgid "remove whole directories" msgstr "удалить каталоги полностью" #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "шаблон" @@ -4725,7 +5049,7 @@ msgstr "git clone [<опции>] [--] <репозиторий> [<каталог> msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 msgid "create a bare repository" msgstr "создать голый репозиторий" @@ -4753,16 +5077,16 @@ msgstr "инициализировать подмодули в клоне" msgid "number of submodules cloned in parallel" msgstr "количество подмодулей, которые будут клонированы парралельно" -#: builtin/clone.c:80 builtin/init-db.c:470 +#: builtin/clone.c:80 builtin/init-db.c:473 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:81 builtin/init-db.c:471 +#: builtin/clone.c:81 builtin/init-db.c:474 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут использованы" -#: builtin/clone.c:83 builtin/submodule--helper.c:498 -#: builtin/submodule--helper.c:777 +#: builtin/clone.c:83 builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:833 msgid "reference repository" msgstr "ссылаемый репозиторий" @@ -4786,7 +5110,7 @@ msgstr "переключиться на <ветку>, вместо HEAD внеш msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 #: builtin/pull.c:201 msgid "depth" msgstr "глубина" @@ -4803,11 +5127,11 @@ msgstr "клонировать только одну ветку, HEAD или --b msgid "any cloned submodules will be shallow" msgstr "все склонированные подмодули будут частичными клонами" -#: builtin/clone.c:98 builtin/init-db.c:479 +#: builtin/clone.c:98 builtin/init-db.c:482 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:99 builtin/init-db.c:480 +#: builtin/clone.c:99 builtin/init-db.c:483 msgid "separate git dir from working tree" msgstr "разместить каталог git отдельно от рабочей копии" @@ -4819,11 +5143,11 @@ msgstr "ключ=значение" msgid "set config inside the new repository" msgstr "установить параметры внутри нового репозитория" -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "использовать только IPv4 адреса" -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "использовать только IPv6 адреса" @@ -4853,6 +5177,11 @@ msgstr "ссылаемый репозиторий «%s» является час msgid "reference repository '%s' is grafted" msgstr "ссылаемый репозиторий «%s» является сращенным" +#: builtin/clone.c:376 +#, c-format +msgid "failed to open '%s'" +msgstr "не удалось открыть «%s»" + #: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" @@ -4873,7 +5202,7 @@ msgstr "не удалось создать ссылку «%s»" msgid "failed to copy file to '%s'" msgstr "не удалось копировать файл в «%s»" -#: builtin/clone.c:449 builtin/clone.c:633 +#: builtin/clone.c:449 #, c-format msgid "done.\n" msgstr "готово.\n" @@ -4890,12 +5219,7 @@ msgstr "Клонирование прошло успешно, но во врем msgid "Could not find remote branch %s to clone." msgstr "Не удалось найти внешнюю ветку %s для клонирования." -#: builtin/clone.c:628 -#, c-format -msgid "Checking connectivity... " -msgstr "Проверка соединения… " - -#: builtin/clone.c:631 +#: builtin/clone.c:633 msgid "remote did not send all necessary objects" msgstr "внешний репозиторий прислал не все необходимые объекты" @@ -4912,99 +5236,99 @@ msgstr "внешний HEAD ссылается на несуществующую msgid "unable to checkout working tree" msgstr "не удалось переключиться на версию в рабочем каталоге" -#: builtin/clone.c:767 +#: builtin/clone.c:766 msgid "unable to write parameters to config file" msgstr "не удалось записать параметры в файл конфигурации" -#: builtin/clone.c:830 +#: builtin/clone.c:829 msgid "cannot repack to clean up" msgstr "не удалось выполнить перепаковку для очистки" -#: builtin/clone.c:832 +#: builtin/clone.c:831 msgid "cannot unlink temporary alternates file" msgstr "не удалось отсоединить временные альтернативные файлы" -#: builtin/clone.c:864 builtin/receive-pack.c:1731 +#: builtin/clone.c:863 builtin/receive-pack.c:1855 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:868 +#: builtin/clone.c:867 msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#: builtin/clone.c:879 +#: builtin/clone.c:878 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s нельзя использовать одновременно." -#: builtin/clone.c:882 +#: builtin/clone.c:881 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir нельзя использовать одновременно." -#: builtin/clone.c:895 +#: builtin/clone.c:894 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не существует" -#: builtin/clone.c:901 builtin/fetch.c:1174 +#: builtin/clone.c:900 builtin/fetch.c:1293 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не является положительным числом" -#: builtin/clone.c:911 +#: builtin/clone.c:910 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже существует и не является пустым каталогом." -#: builtin/clone.c:921 +#: builtin/clone.c:920 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже существует." -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 -#: builtin/worktree.c:220 builtin/worktree.c:247 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалось создать родительские каталоги для «%s»" -#: builtin/clone.c:939 +#: builtin/clone.c:938 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалось создать рабочий каталог «%s»" -#: builtin/clone.c:957 +#: builtin/clone.c:956 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:959 +#: builtin/clone.c:958 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:998 +#: builtin/clone.c:997 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." -#: builtin/clone.c:1001 +#: builtin/clone.c:1000 msgid "source repository is shallow, ignoring --local" msgstr "исходный репозиторий является частичным, --local игнорируется" -#: builtin/clone.c:1006 +#: builtin/clone.c:1005 msgid "--local is ignored" msgstr "--local игнорируется" -#: builtin/clone.c:1010 +#: builtin/clone.c:1009 #, c-format msgid "Don't know how to clone %s" msgstr "Не знаю как клонировать %s" -#: builtin/clone.c:1059 builtin/clone.c:1067 +#: builtin/clone.c:1058 builtin/clone.c:1066 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" -#: builtin/clone.c:1070 +#: builtin/clone.c:1069 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пустой репозиторий." @@ -5107,103 +5431,103 @@ msgid "" "the remaining commits.\n" msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n" -#: builtin/commit.c:307 +#: builtin/commit.c:308 msgid "failed to unpack HEAD tree object" msgstr "сбой распаковки объекта дерева HEAD" -#: builtin/commit.c:348 +#: builtin/commit.c:349 msgid "unable to create temporary index" msgstr "не удалось создать временный индекс" -#: builtin/commit.c:354 +#: builtin/commit.c:355 msgid "interactive add failed" msgstr "сбой интерактивного добавления" -#: builtin/commit.c:367 +#: builtin/commit.c:368 msgid "unable to update temporary index" msgstr "не удалось обновить временный индекс" -#: builtin/commit.c:369 +#: builtin/commit.c:370 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении основного кэша дерева" -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 msgid "unable to write new_index file" msgstr "не удалось записать файл new_index" -#: builtin/commit.c:447 +#: builtin/commit.c:448 msgid "cannot do a partial commit during a merge." msgstr "нельзя создать частичный коммит во время слияния." -#: builtin/commit.c:449 +#: builtin/commit.c:450 msgid "cannot do a partial commit during a cherry-pick." msgstr "нельзя создать частичный коммит во время копирования коммита." -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot read the index" msgstr "не удалось прочитать индекс" -#: builtin/commit.c:477 +#: builtin/commit.c:478 msgid "unable to write temporary index file" msgstr "не удалось записать временный файл индекса" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отсутствует автор в заголовке" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» строка автора в неправильном формате" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:611 +#: builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "не удалось запросить коммит %s" -#: builtin/commit.c:704 builtin/shortlog.c:285 +#: builtin/commit.c:705 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из стандартного ввода)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "не удалось прочитать файл журнала из стандартного ввода" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "не удалось прочитать файл журнала «%s»" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "не удалось прочитать SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "не удалось прочитать MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "не удалось записать шаблон описания коммита" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -5213,7 +5537,7 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -5223,14 +5547,14 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5238,341 +5562,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:860 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:868 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:874 +#: builtin/commit.c:875 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Не удалось прочитать индекс" -#: builtin/commit.c:949 +#: builtin/commit.c:950 msgid "Error building trees" msgstr "Ошибка при построении деревьев" -#: builtin/commit.c:964 builtin/tag.c:266 +#: builtin/commit.c:965 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" -#: builtin/commit.c:1066 +#: builtin/commit.c:1067 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" -#: builtin/commit.c:1081 builtin/commit.c:1321 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправильный режим неотслеживаемых файлов «%s»" -#: builtin/commit.c:1118 +#: builtin/commit.c:1119 msgid "--long and -z are incompatible" msgstr "--long и -z нельзя использовать одновременно" -#: builtin/commit.c:1148 +#: builtin/commit.c:1149 msgid "Using both --reset-author and --author does not make sense" msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" -#: builtin/commit.c:1157 +#: builtin/commit.c:1158 msgid "You have nothing to amend." msgstr "Нечего исправлять." -#: builtin/commit.c:1160 +#: builtin/commit.c:1161 msgid "You are in the middle of a merge -- cannot amend." msgstr "Вы в процессе слияния — сейчас нельзя исправлять." -#: builtin/commit.c:1162 +#: builtin/commit.c:1163 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять." -#: builtin/commit.c:1165 +#: builtin/commit.c:1166 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут использоваться одновременно" -#: builtin/commit.c:1175 +#: builtin/commit.c:1176 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1177 +#: builtin/commit.c:1178 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup." -#: builtin/commit.c:1185 +#: builtin/commit.c:1186 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." -#: builtin/commit.c:1202 +#: builtin/commit.c:1203 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1204 +#: builtin/commit.c:1205 msgid "No paths with --include/--only does not make sense." msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." -#: builtin/commit.c:1206 +#: builtin/commit.c:1207 msgid "Clever... amending the last one with dirty index." msgstr "Умно… отмена последнего с измененным индексом." -#: builtin/commit.c:1208 +#: builtin/commit.c:1209 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Пути явно указаны пути без опций -i или -o; предполагаю опцию --only…" -#: builtin/commit.c:1220 builtin/tag.c:474 +#: builtin/commit.c:1221 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Неправильное значение режима очистки %s" -#: builtin/commit.c:1225 +#: builtin/commit.c:1226 msgid "Paths with -a does not make sense." msgstr "С опцией -a указание пути не имеет смысла." -#: builtin/commit.c:1335 builtin/commit.c:1621 +#: builtin/commit.c:1336 builtin/commit.c:1622 msgid "show status concisely" msgstr "кратко показать статус" -#: builtin/commit.c:1337 builtin/commit.c:1623 +#: builtin/commit.c:1338 builtin/commit.c:1624 msgid "show branch information" msgstr "показать информацию о версии" -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 -#: builtin/worktree.c:437 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/worktree.c:440 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1342 builtin/commit.c:1627 +#: builtin/commit.c:1343 builtin/commit.c:1628 msgid "show status in long format (default)" msgstr "показать статус в длинном формате (по умолчанию)" -#: builtin/commit.c:1345 builtin/commit.c:1630 +#: builtin/commit.c:1346 builtin/commit.c:1631 msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "режим" -#: builtin/commit.c:1348 builtin/commit.c:1633 +#: builtin/commit.c:1349 builtin/commit.c:1634 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1351 +#: builtin/commit.c:1352 msgid "show ignored files" msgstr "показать игнорируемые файлы" -#: builtin/commit.c:1352 parse-options.h:155 +#: builtin/commit.c:1353 parse-options.h:155 msgid "when" msgstr "когда" -#: builtin/commit.c:1353 +#: builtin/commit.c:1354 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1356 msgid "list untracked files in columns" msgstr "показать неотслеживаемые файлы по столбцам" -#: builtin/commit.c:1441 +#: builtin/commit.c:1442 msgid "couldn't look up newly created commit" msgstr "нельзя запросить новосозданный коммит" -#: builtin/commit.c:1443 +#: builtin/commit.c:1444 msgid "could not parse newly created commit" msgstr "нельзя разобрать новосозданный коммит" -#: builtin/commit.c:1488 +#: builtin/commit.c:1489 msgid "detached HEAD" msgstr "отделённый HEAD" -#: builtin/commit.c:1491 +#: builtin/commit.c:1492 msgid " (root-commit)" msgstr " (корневой коммит)" -#: builtin/commit.c:1591 +#: builtin/commit.c:1592 msgid "suppress summary after successful commit" msgstr "не выводить сводку после успешного коммита" -#: builtin/commit.c:1592 +#: builtin/commit.c:1593 msgid "show diff in commit message template" msgstr "добавить список изменений в шаблон сообщения коммита" -#: builtin/commit.c:1594 +#: builtin/commit.c:1595 msgid "Commit message options" msgstr "Опции сообщения коммита" -#: builtin/commit.c:1595 builtin/tag.c:351 +#: builtin/commit.c:1596 builtin/tag.c:351 msgid "read message from file" msgstr "прочитать сообщение из файла" -#: builtin/commit.c:1596 +#: builtin/commit.c:1597 msgid "author" msgstr "автор" -#: builtin/commit.c:1596 +#: builtin/commit.c:1597 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1597 builtin/gc.c:326 +#: builtin/commit.c:1598 builtin/gc.c:326 msgid "date" msgstr "дата" -#: builtin/commit.c:1597 +#: builtin/commit.c:1598 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 -#: builtin/notes.c:558 builtin/tag.c:349 +#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 +#: builtin/notes.c:559 builtin/tag.c:349 msgid "message" msgstr "сообщение" -#: builtin/commit.c:1598 +#: builtin/commit.c:1599 msgid "commit message" msgstr "сообщение коммита" -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 +#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1599 +#: builtin/commit.c:1600 msgid "reuse and edit message from specified commit" msgstr "использовать и отредактировать сообщение от указанного коммита" -#: builtin/commit.c:1600 +#: builtin/commit.c:1601 msgid "reuse message from specified commit" msgstr "использовать сообщение указанного коммита" -#: builtin/commit.c:1601 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to fixup specified commit" msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" -#: builtin/commit.c:1602 +#: builtin/commit.c:1603 msgid "use autosquash formatted message to squash specified commit" msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" -#: builtin/commit.c:1603 +#: builtin/commit.c:1604 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторством (с использованием -C/-c/--amend)" -#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 +#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "добавить Signed-off-by:" -#: builtin/commit.c:1605 +#: builtin/commit.c:1606 msgid "use specified template file" msgstr "использовать указанный файл шаблона" -#: builtin/commit.c:1606 +#: builtin/commit.c:1607 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1607 +#: builtin/commit.c:1608 msgid "default" msgstr "по-умолчанию" -#: builtin/commit.c:1607 builtin/tag.c:354 +#: builtin/commit.c:1608 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "как удалять пробелы и #комментарии из сообщения коммита" -#: builtin/commit.c:1608 +#: builtin/commit.c:1609 msgid "include status in commit message template" msgstr "включить статус файлов в шаблон сообщения коммита" -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 +#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "подписать коммит с помощью GPG" -#: builtin/commit.c:1613 +#: builtin/commit.c:1614 msgid "Commit contents options" msgstr "Опции содержимого коммита" -#: builtin/commit.c:1614 +#: builtin/commit.c:1615 msgid "commit all changed files" msgstr "закоммитить все измененные файлы" -#: builtin/commit.c:1615 +#: builtin/commit.c:1616 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в индекс для коммита" -#: builtin/commit.c:1616 +#: builtin/commit.c:1617 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1617 +#: builtin/commit.c:1618 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1618 +#: builtin/commit.c:1619 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1619 -msgid "bypass pre-commit hook" -msgstr "пропустить перехватчик перед-коммитом" - #: builtin/commit.c:1620 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "пропустить перехватчик pre-commit и commit-msg" + +#: builtin/commit.c:1621 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1631 +#: builtin/commit.c:1632 msgid "amend previous commit" msgstr "исправить предыдущий коммит" -#: builtin/commit.c:1632 +#: builtin/commit.c:1633 msgid "bypass post-rewrite hook" -msgstr "пропустить перехватчик после-перезаписи" +msgstr "пропустить перехватчик post-rewrite" -#: builtin/commit.c:1637 +#: builtin/commit.c:1638 msgid "ok to record an empty change" msgstr "разрешить запись пустого коммита" -#: builtin/commit.c:1639 +#: builtin/commit.c:1640 msgid "ok to record a change with an empty message" msgstr "разрешить запись изменений с пустым сообщением" -#: builtin/commit.c:1668 +#: builtin/commit.c:1669 msgid "could not parse HEAD commit" msgstr "не удалось разобрать HEAD коммит" -#: builtin/commit.c:1718 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1725 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "не удалось прочитать MERGE_MODE" -#: builtin/commit.c:1744 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "не удалось открыть сообщение коммита: %s" -#: builtin/commit.c:1755 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Отмена коммита; вы не изменили сообщение.\n" -#: builtin/commit.c:1760 +#: builtin/commit.c:1761 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пустого сообщения коммита.\n" -#: builtin/commit.c:1808 +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5583,139 +5907,139 @@ msgstr "Репозиторий был обновлен, но не удалось msgid "git config [<options>]" msgstr "git config [<опции>]" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "Config file location" msgstr "Размещение файла конфигурации" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "use global config file" msgstr "использовать глобальный файл конфигурации" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "use system config file" msgstr "использовать системный файл конфигурации" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "use repository config file" msgstr "использовать файл конфигурации репозитория" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "use given config file" msgstr "использовать указанный файл конфигурации" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "blob-id" msgstr "идент-двоичн-объекта" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "read config from given blob object" msgstr "прочитать настройки из указанного двоичного объекта" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "Action" msgstr "Действие" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "get value: name [value-regex]" msgstr "получить значение: имя [шаблон-значений]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "get all values: key [value-regex]" msgstr "получить все значения: ключ [шаблон-значений]" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "get values for regexp: name-regex [value-regex]" msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "get value specific for the URL: section[.var] URL" msgstr "получить значение, специфичное для URL: раздел[.переменная] URL" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "replace all matching variables: name value [value_regex]" msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "add a new variable: name value" msgstr "добавить новую переменную: имя значение" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "remove a variable: name [value-regex]" msgstr "удалить переменную: имя [шаблон-значений]" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "remove all matches: name [value-regex]" msgstr "удалить все совпадающие: имя [шаблон-значений]" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "rename section: old-name new-name" msgstr "переименовать раздел: старое-имя новое-имя" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "remove a section: name" msgstr "удалить раздел: имя" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "list all" msgstr "показать весь список" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "open an editor" msgstr "открыть в редакторе" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "find the color configured: slot [default]" msgstr "найти настроенный цвет: раздел [по-умолчанию]" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "find the color setting: slot [stdout-is-tty]" msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "Type" msgstr "Тип" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "value is \"true\" or \"false\"" msgstr "значение — это «true» (правда) или «false» (ложь)" -#: builtin/config.c:79 +#: builtin/config.c:78 msgid "value is decimal number" msgstr "значение — это десятичное число" -#: builtin/config.c:80 +#: builtin/config.c:79 msgid "value is --bool or --int" msgstr "значение — это --bool или --int" -#: builtin/config.c:81 +#: builtin/config.c:80 msgid "value is a path (file or directory name)" msgstr "значение — это путь (к файлу или каталогу)" -#: builtin/config.c:82 +#: builtin/config.c:81 msgid "Other" msgstr "Другое" -#: builtin/config.c:83 +#: builtin/config.c:82 msgid "terminate values with NUL byte" msgstr "завершать значения НУЛЕВЫМ байтом" -#: builtin/config.c:84 +#: builtin/config.c:83 msgid "show variable names only" msgstr "показывать только имена переменных" -#: builtin/config.c:85 +#: builtin/config.c:84 msgid "respect include directives on lookup" msgstr "учитывать директивы include (включения файлов) при запросе" -#: builtin/config.c:86 +#: builtin/config.c:85 msgid "show origin of config (file, standard input, blob, command line)" msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "не удалось разобрать значение цвета по умолчанию" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5725,7 +6049,7 @@ msgid "" "#\temail = %s\n" msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:614 +#: builtin/config.c:613 #, c-format msgid "cannot create configuration file %s" msgstr "не удалось создать файл конфигурации %s" @@ -5761,10 +6085,10 @@ msgstr "аннотированная метка %s не содержит вст msgid "tag '%s' is really '%s' here" msgstr "метка «%s» уже здесь «%s»" -#: builtin/describe.c:250 builtin/log.c:465 +#: builtin/describe.c:250 builtin/log.c:480 #, c-format msgid "Not a valid object name %s" -msgstr "Недействительное имя объекта %s" +msgstr "Недопустимое имя объекта %s" #: builtin/describe.c:253 #, c-format @@ -5884,7 +6208,7 @@ msgstr "неправильный параметр: %s" #: builtin/diff.c:360 msgid "Not a git repository" -msgstr "Не является репозиторием git" +msgstr "Не найден git репозитоий" #: builtin/diff.c:403 #, c-format @@ -5953,262 +6277,263 @@ msgstr "Применить спецификацию ссылки к экспор msgid "anonymize output" msgstr "сделать вывод анонимным" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] <group>" msgstr "git fetch [<опции>] <группа>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:92 builtin/pull.c:174 +#: builtin/fetch.c:93 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" -#: builtin/fetch.c:94 builtin/pull.c:177 +#: builtin/fetch.c:95 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" -#: builtin/fetch.c:96 builtin/pull.c:180 +#: builtin/fetch.c:97 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" -#: builtin/fetch.c:97 builtin/pull.c:182 +#: builtin/fetch.c:98 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "принудительная перезапись локальной ветки" -#: builtin/fetch.c:99 +#: builtin/fetch.c:100 msgid "fetch from multiple remotes" msgstr "извлечь с нескольких внешних репозиториев" -#: builtin/fetch.c:101 builtin/pull.c:184 +#: builtin/fetch.c:102 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "извлечь все метки и связанные объекты" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "do not fetch all tags (--no-tags)" msgstr "не извлекать все метки (--no-tags)" -#: builtin/fetch.c:105 +#: builtin/fetch.c:106 msgid "number of submodules fetched in parallel" msgstr "количество подмодулей, которые будут скачаны парралельно" -#: builtin/fetch.c:107 builtin/pull.c:187 +#: builtin/fetch.c:108 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:108 builtin/pull.c:190 +#: builtin/fetch.c:109 builtin/pull.c:190 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:109 builtin/pull.c:191 +#: builtin/fetch.c:110 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/fetch.c:113 builtin/pull.c:199 +#: builtin/fetch.c:114 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "оставить загруженный пакет данных" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "allow updating of HEAD ref" msgstr "разрешить обновление ссылки HEAD" -#: builtin/fetch.c:118 builtin/pull.c:202 +#: builtin/fetch.c:119 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "глубокая история частичного клона" -#: builtin/fetch.c:120 builtin/pull.c:205 +#: builtin/fetch.c:121 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/fetch.c:122 builtin/log.c:1399 +#: builtin/fetch.c:123 builtin/log.c:1426 msgid "dir" msgstr "каталог" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "prepend this to submodule path output" msgstr "присоединять это спереди к выводу путей подмодуля" -#: builtin/fetch.c:126 +#: builtin/fetch.c:127 msgid "default mode for recursion" msgstr "режим по умолчанию для рекурсии" -#: builtin/fetch.c:128 builtin/pull.c:208 +#: builtin/fetch.c:129 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "принимать ссылки, которые обновляют .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:210 +#: builtin/fetch.c:130 builtin/pull.c:210 msgid "refmap" msgstr "соответствие-ссылок" -#: builtin/fetch.c:130 builtin/pull.c:211 +#: builtin/fetch.c:131 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "указать соответствие ссылок при извлечении" -#: builtin/fetch.c:386 +#: builtin/fetch.c:387 msgid "Couldn't find remote ref HEAD" msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" -#: builtin/fetch.c:466 +#: builtin/fetch.c:503 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "опция fetch.output содержит неправильное значение для %s" + +#: builtin/fetch.c:592 #, c-format msgid "object %s not found" msgstr "объект %s не найден" -#: builtin/fetch.c:471 +#: builtin/fetch.c:596 msgid "[up to date]" msgstr "[актуально]" -#: builtin/fetch.c:485 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s → %s (не удалось извлечь в текущую ветку)" - -#: builtin/fetch.c:486 builtin/fetch.c:574 +#: builtin/fetch.c:609 builtin/fetch.c:689 msgid "[rejected]" msgstr "[отклонено]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:610 +msgid "can't fetch in current branch" +msgstr "нельзя извлечь текущую ветку" + +#: builtin/fetch.c:619 msgid "[tag update]" msgstr "[обновление метки]" -#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 -msgid " (unable to update local ref)" -msgstr " (не удалось обновить локальную ссылку)" +#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 +#: builtin/fetch.c:684 +msgid "unable to update local ref" +msgstr "не удалось обновить локальную ссылку" -#: builtin/fetch.c:517 +#: builtin/fetch.c:639 msgid "[new tag]" msgstr "[новая метка]" -#: builtin/fetch.c:520 +#: builtin/fetch.c:642 msgid "[new branch]" msgstr "[новая ветка]" -#: builtin/fetch.c:523 +#: builtin/fetch.c:645 msgid "[new ref]" msgstr "[новая ссылка]" -#: builtin/fetch.c:569 -msgid "unable to update local ref" -msgstr "не удалось обновить локальную ссылку" - -#: builtin/fetch.c:569 +#: builtin/fetch.c:684 msgid "forced update" msgstr "принудительное обновление" -#: builtin/fetch.c:576 -msgid "(non-fast-forward)" -msgstr "(без перемотки вперед)" +#: builtin/fetch.c:689 +msgid "non-fast-forward" +msgstr "без перемотки вперед" -#: builtin/fetch.c:619 +#: builtin/fetch.c:733 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s не отправил все необходимые объекты\n" -#: builtin/fetch.c:637 +#: builtin/fetch.c:753 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" -#: builtin/fetch.c:724 builtin/fetch.c:816 +#: builtin/fetch.c:839 builtin/fetch.c:934 #, c-format msgid "From %.*s\n" msgstr "Из %.*s\n" -#: builtin/fetch.c:735 +#: builtin/fetch.c:850 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки" -#: builtin/fetch.c:787 +#: builtin/fetch.c:904 #, c-format msgid " (%s will become dangling)" msgstr " (%s будет висящей веткой)" -#: builtin/fetch.c:788 +#: builtin/fetch.c:905 #, c-format msgid " (%s has become dangling)" msgstr " (%s стала висящей веткой)" -#: builtin/fetch.c:820 +#: builtin/fetch.c:937 msgid "[deleted]" msgstr "[удалено]" -#: builtin/fetch.c:821 builtin/remote.c:1025 +#: builtin/fetch.c:938 builtin/remote.c:1020 msgid "(none)" msgstr "(нет)" -#: builtin/fetch.c:841 +#: builtin/fetch.c:960 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Отказ получения в текущую ветку %s не голого репозитория" -#: builtin/fetch.c:860 +#: builtin/fetch.c:979 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" -#: builtin/fetch.c:863 +#: builtin/fetch.c:982 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Параметр «%s» игнорируется для %s\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:1039 #, c-format msgid "Don't know how to fetch from %s" msgstr "Не знаю как извлечь с %s" -#: builtin/fetch.c:1080 +#: builtin/fetch.c:1199 #, c-format msgid "Fetching %s\n" msgstr "Извлечение из %s\n" -#: builtin/fetch.c:1082 builtin/remote.c:96 +#: builtin/fetch.c:1201 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Не удалось извлечь %s" -#: builtin/fetch.c:1100 +#: builtin/fetch.c:1219 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции." -#: builtin/fetch.c:1123 +#: builtin/fetch.c:1242 msgid "You need to specify a tag name." msgstr "Вам нужно указать имя метки." -#: builtin/fetch.c:1165 +#: builtin/fetch.c:1284 msgid "--depth and --unshallow cannot be used together" msgstr "нельзя использовать одновременно --depth и --unshallow" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1286 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет смысла на полном репозитории" -#: builtin/fetch.c:1187 +#: builtin/fetch.c:1306 msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает имя репозитория как аргумент" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1308 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all не имеет смысла при указании спецификаций ссылок" -#: builtin/fetch.c:1200 +#: builtin/fetch.c:1319 #, c-format msgid "No such remote or remote group: %s" msgstr "Нет такого внешнего репозитория или группы: %s" -#: builtin/fetch.c:1208 +#: builtin/fetch.c:1327 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" @@ -6293,63 +6618,63 @@ msgstr "вывод только не слитых ссылок" msgid "print only refs which contain the commit" msgstr "вывод только ссылок, которые содержат коммит" -#: builtin/fsck.c:156 builtin/prune.c:140 -msgid "Checking connectivity" -msgstr "Проверка соединения" - -#: builtin/fsck.c:486 +#: builtin/fsck.c:519 msgid "Checking object directories" msgstr "Проверка каталогов объектов" -#: builtin/fsck.c:552 +#: builtin/fsck.c:588 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<опции>] [<объект>…]" -#: builtin/fsck.c:558 +#: builtin/fsck.c:594 msgid "show unreachable objects" msgstr "показать недоступные объекты" -#: builtin/fsck.c:559 +#: builtin/fsck.c:595 msgid "show dangling objects" msgstr "показать объекты, на которые нет ссылок" -#: builtin/fsck.c:560 +#: builtin/fsck.c:596 msgid "report tags" msgstr "вывести отчет по меткам" -#: builtin/fsck.c:561 +#: builtin/fsck.c:597 msgid "report root nodes" msgstr "вывести отчет по корневым узлам" -#: builtin/fsck.c:562 +#: builtin/fsck.c:598 msgid "make index objects head nodes" msgstr "воспринимать объекты в индексе как корневые узлы" -#: builtin/fsck.c:563 +#: builtin/fsck.c:599 msgid "make reflogs head nodes (default)" msgstr "создать корневые узлы журналов ссылок (по умолчанию)" -#: builtin/fsck.c:564 +#: builtin/fsck.c:600 msgid "also consider packs and alternate objects" msgstr "также проверять пакеты и альтернативные объекты" -#: builtin/fsck.c:565 +#: builtin/fsck.c:601 msgid "check only connectivity" msgstr "только проверить соединение" -#: builtin/fsck.c:566 +#: builtin/fsck.c:602 msgid "enable more strict checking" msgstr "использовать более строгую проверку" -#: builtin/fsck.c:568 +#: builtin/fsck.c:604 msgid "write dangling objects in .git/lost-found" msgstr "записать объекты на которые нет ссылок в .git/lost-found" -#: builtin/fsck.c:569 builtin/prune.c:107 +#: builtin/fsck.c:605 builtin/prune.c:107 msgid "show progress" msgstr "показать прогресс выполнения" -#: builtin/fsck.c:630 +#: builtin/fsck.c:606 +msgid "show verbose names for reachable objects" +msgstr "показать подробные имена для недоступных объектов" + +#: builtin/fsck.c:671 msgid "Checking objects" msgstr "Проверка объектов" @@ -6630,7 +6955,7 @@ msgstr "разрешить вызов grep(1) (игнорируется в эт msgid "no pattern given." msgstr "не задан шаблон." -#: builtin/grep.c:845 builtin/index-pack.c:1477 +#: builtin/grep.c:845 builtin/index-pack.c:1479 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количество потоков (%d)" @@ -6768,73 +7093,73 @@ msgstr "программа просмотра man не обработала за msgid "no info viewer handled the request" msgstr "программа просмотра info не обработала запрос" -#: builtin/help.c:408 +#: builtin/help.c:401 msgid "Defining attributes per path" msgstr "Определение атрибутов для путей файлов или каталогов" -#: builtin/help.c:409 +#: builtin/help.c:402 msgid "Everyday Git With 20 Commands Or So" msgstr "Повседневный Git с 20 командами или около того" -#: builtin/help.c:410 +#: builtin/help.c:403 msgid "A Git glossary" msgstr "Глоссарий Git" -#: builtin/help.c:411 +#: builtin/help.c:404 msgid "Specifies intentionally untracked files to ignore" msgstr "Указание специально игнорируемых файлов" -#: builtin/help.c:412 +#: builtin/help.c:405 msgid "Defining submodule properties" msgstr "Определение свойств подмодулей" -#: builtin/help.c:413 +#: builtin/help.c:406 msgid "Specifying revisions and ranges for Git" msgstr "Указание редакций и диапазонов для Git" -#: builtin/help.c:414 +#: builtin/help.c:407 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Учебное введение в Git (для версии 1.5.1 или новее)" -#: builtin/help.c:415 +#: builtin/help.c:408 msgid "An overview of recommended workflows with Git" msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" -#: builtin/help.c:427 +#: builtin/help.c:420 msgid "The common Git guides are:\n" msgstr "Основные руководства Git:\n" -#: builtin/help.c:448 builtin/help.c:465 +#: builtin/help.c:441 builtin/help.c:458 #, c-format msgid "usage: %s%s" msgstr "использование: %s%s" -#: builtin/help.c:481 +#: builtin/help.c:474 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "«git %s» — это сокращение для «%s»" -#: builtin/index-pack.c:152 +#: builtin/index-pack.c:153 #, c-format msgid "unable to open %s" msgstr "не удалось открыть %s" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:203 #, c-format msgid "object type mismatch at %s" msgstr "несоответствие типа объекта на %s" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:223 #, c-format msgid "did not receive expected object %s" msgstr "ожидаемый объект не получен на %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "object %s: expected type %s, found %s" msgstr "объект %s: ожидаемый тип %s, получен %s" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:268 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -6843,159 +7168,159 @@ msgstr[1] "не удалось заполнить %d байта" msgstr[2] "не удалось заполнить %d байтов" msgstr[3] "не удалось заполнить %d байтов" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:278 msgid "early EOF" msgstr "неожиданный конец файла" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "read error on input" msgstr "ошибка чтения ввода" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:291 msgid "used more bytes than were available" msgstr "использовано больше байт, чем было доступно" -#: builtin/index-pack.c:297 +#: builtin/index-pack.c:298 msgid "pack too large for current definition of off_t" msgstr "пакет слишком большой для текущего определения off_t" -#: builtin/index-pack.c:313 +#: builtin/index-pack.c:314 #, c-format msgid "unable to create '%s'" msgstr "не удалось создать «%s»" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "cannot open packfile '%s'" msgstr "не удалось открыть файл пакета «%s»" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 msgid "pack signature mismatch" msgstr "несоответствие подписи пакета" -#: builtin/index-pack.c:334 +#: builtin/index-pack.c:335 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "версия пакета %<PRIu32> не поддерживается" -#: builtin/index-pack.c:352 +#: builtin/index-pack.c:353 #, c-format -msgid "pack has bad object at offset %lu: %s" -msgstr "в пакете содержится поврежденный объект по смещению %lu: %s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s" -#: builtin/index-pack.c:473 +#: builtin/index-pack.c:475 #, c-format msgid "inflate returned %d" msgstr "программа сжатия вернула %d" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:524 msgid "offset value overflow for delta base object" msgstr "переполнение значения смещения у базового объекта дельты" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:532 msgid "delta base offset is out of bound" msgstr "смещение базовой дельты вышло за допустимые пределы" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:540 #, c-format msgid "unknown object type %d" msgstr "неизвестный тип объекта %d" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:571 msgid "cannot pread pack file" msgstr "не удалось выполнить pread для файла пакета" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:573 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "преждевременное окончание файла пакета, %lu байт отсутствует" -msgstr[1] "преждевременное окончание файла пакета, %lu байта отсутствует" -msgstr[2] "преждевременное окончание файла пакета, %lu байтов отсутствует" -msgstr[3] "преждевременное окончание файла пакета, %lu байтов отсутствует" +msgid "premature end of pack file, %<PRIuMAX> byte missing" +msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" +msgstr[0] "преждевременное окончание файла пакета, %<PRIuMAX> байт отсутствует" +msgstr[1] "преждевременное окончание файла пакета, %<PRIuMAX> байта отсутствует" +msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" +msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" -#: builtin/index-pack.c:597 +#: builtin/index-pack.c:599 msgid "serious inflate inconsistency" msgstr "серьезное несоответствие при распаковке" -#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 -#: builtin/index-pack.c:806 builtin/index-pack.c:815 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" -#: builtin/index-pack.c:746 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:748 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "не удалось прочитать %s" -#: builtin/index-pack.c:812 +#: builtin/index-pack.c:814 #, c-format msgid "cannot read existing object %s" msgstr "не удалось прочитать существующий объект %s" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:828 #, c-format msgid "invalid blob object %s" msgstr "неправильный файл двоичного объекта %s" -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "неправильный %s" -#: builtin/index-pack.c:843 +#: builtin/index-pack.c:845 msgid "Error in object" msgstr "Ошибка в объекте" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Не все дочерние объекты %s достижимы" -#: builtin/index-pack.c:917 builtin/index-pack.c:948 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "сбой при применении дельты" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1120 msgid "Receiving objects" msgstr "Получение объектов" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1120 msgid "Indexing objects" msgstr "Индексирование объектов" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакет поврежден (несоответствие SHA1)" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "не удалось выполнить fstat для файла пакета" -#: builtin/index-pack.c:1158 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "файл пакета содержит мусор в конце" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "безумная путаница в parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1196 msgid "Resolving deltas" msgstr "Определение изменений" -#: builtin/index-pack.c:1205 +#: builtin/index-pack.c:1207 #, c-format msgid "unable to create thread: %s" msgstr "не удалось создать поток: %s" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "безумная путаница" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -7004,12 +7329,12 @@ msgstr[1] "завершено с %d локальными объектами" msgstr[2] "завершено с %d локальными объектами" msgstr[3] "завершено с %d локальными объектами" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" -#: builtin/index-pack.c:1269 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -7018,59 +7343,59 @@ msgstr[1] "пакет содержит %d неразрешенные дельт msgstr[2] "пакет содержит %d неразрешенных дельт" msgstr[3] "пакет содержит %d неразрешенных дельт" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "нельзя сжать присоединенный объект (%d)" -#: builtin/index-pack.c:1369 +#: builtin/index-pack.c:1371 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1393 +#: builtin/index-pack.c:1395 msgid "error while closing pack file" msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1408 #, c-format msgid "cannot write keep file '%s'" msgstr "не удалось записать файл удержания «%s»" -#: builtin/index-pack.c:1414 +#: builtin/index-pack.c:1416 #, c-format msgid "cannot close written keep file '%s'" msgstr "не удалось закрыть записанный файл удержания «%s»" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1429 msgid "cannot store pack file" msgstr "не удалось сохранить файл пакета" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1440 msgid "cannot store index file" msgstr "не удалось сохранить файл индекса" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1473 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "плохой pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 +#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Не удалось открыть существующий файл пакета «%s»" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Не удалось открыть существующий файл индекса для «%s»" -#: builtin/index-pack.c:1589 +#: builtin/index-pack.c:1591 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -7079,7 +7404,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" msgstr[3] "не дельты: %d объектов" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1598 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -7088,26 +7413,22 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" msgstr[3] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1611 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "имя пакета «%s» не оканчивается на «.pack»" -#: builtin/index-pack.c:1638 -msgid "Cannot come back to cwd" -msgstr "Не удалось вернуться в текущий рабочий каталог" - -#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 -#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 +#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1723 +#: builtin/index-pack.c:1730 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin нельзя использовать без --stdin" -#: builtin/index-pack.c:1731 +#: builtin/index-pack.c:1738 msgid "--verify with no packfile name given" msgstr "--verify без указания имени файла пакета" @@ -7171,58 +7492,58 @@ msgstr "не удается обработать файл типа %d" msgid "unable to move %s to %s" msgstr "не удается переместить файл %s в %s" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:403 +#: builtin/init-db.c:402 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s репозиторий Git в %s%s\n" +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:404 -msgid "Reinitialized existing" -msgstr "Переинициализация существующего" +#: builtin/init-db.c:403 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Переинициализирован существующий репозиторий Git в %s%s\n" -#: builtin/init-db.c:404 -msgid "Initialized empty" -msgstr "Инициализирован пустой" +#: builtin/init-db.c:407 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:405 -msgid " shared" -msgstr " общий" +#: builtin/init-db.c:408 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Инициализирован пустой репозиторий Git в %s%s\n" -#: builtin/init-db.c:452 +#: builtin/init-db.c:455 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]" -#: builtin/init-db.c:475 +#: builtin/init-db.c:478 msgid "permissions" msgstr "права-доступа" -#: builtin/init-db.c:476 +#: builtin/init-db.c:479 msgid "specify that the git repository is to be shared amongst several users" msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями" -#: builtin/init-db.c:510 builtin/init-db.c:515 +#: builtin/init-db.c:513 builtin/init-db.c:518 #, c-format msgid "cannot mkdir %s" msgstr "не удалось выполнить mkdir %s" -#: builtin/init-db.c:519 +#: builtin/init-db.c:522 #, c-format msgid "cannot chdir to %s" msgstr "не удалось выполнить chdir в %s" -#: builtin/init-db.c:540 +#: builtin/init-db.c:543 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)" -#: builtin/init-db.c:568 +#: builtin/init-db.c:571 #, c-format msgid "Cannot access work tree '%s'" msgstr "Не удалось получить доступ к рабочему каталогу «%s»" @@ -7253,423 +7574,423 @@ msgstr "завершители для добавления" msgid "no input file given for in-place editing" msgstr "ничего не передано, для редактирования файлов на месте" -#: builtin/log.c:43 +#: builtin/log.c:44 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git show [<options>] <object>..." msgstr "git show [<опции>] <объект>…" -#: builtin/log.c:83 +#: builtin/log.c:84 #, c-format msgid "invalid --decorate option: %s" msgstr "неправильный параметр для --decorate: %s" -#: builtin/log.c:137 +#: builtin/log.c:139 msgid "suppress diff output" msgstr "не выводить различия" -#: builtin/log.c:138 +#: builtin/log.c:140 msgid "show source" msgstr "показать источник" -#: builtin/log.c:139 +#: builtin/log.c:141 msgid "Use mail map file" msgstr "Использовать файл соответствия почтовых адресов" -#: builtin/log.c:140 +#: builtin/log.c:142 msgid "decorate options" msgstr "опции формата вывода ссылок" -#: builtin/log.c:143 +#: builtin/log.c:145 msgid "Process line range n,m in file, counting from 1" msgstr "Обработать диапазон строк n,m из файла, начиная с 1" -#: builtin/log.c:239 +#: builtin/log.c:241 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:471 +#: builtin/log.c:486 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:485 builtin/log.c:578 +#: builtin/log.c:500 builtin/log.c:594 #, c-format msgid "Could not read object %s" msgstr "Не удалось прочитать объект %s" -#: builtin/log.c:602 +#: builtin/log.c:618 #, c-format msgid "Unknown type: %d" msgstr "Неизвестный тип объекта: %d" -#: builtin/log.c:722 +#: builtin/log.c:739 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:812 +#: builtin/log.c:839 msgid "name of output directory is too long" msgstr "слишком длинное имя выходного каталога" -#: builtin/log.c:827 +#: builtin/log.c:854 #, c-format msgid "Cannot open patch file %s" msgstr "Ну удалось открыть файл изменений %s" -#: builtin/log.c:841 +#: builtin/log.c:868 msgid "Need exactly one range." msgstr "Нужен только один диапазон." -#: builtin/log.c:851 +#: builtin/log.c:878 msgid "Not a range." msgstr "Не является диапазоном." -#: builtin/log.c:957 +#: builtin/log.c:984 msgid "Cover letter needs email format" msgstr "Сопроводительное письмо должно быть в формате электронной почты" -#: builtin/log.c:1036 +#: builtin/log.c:1064 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1064 +#: builtin/log.c:1092 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" -#: builtin/log.c:1109 +#: builtin/log.c:1137 msgid "Two output directories?" msgstr "Два выходных каталога?" -#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 #, c-format msgid "Unknown commit %s" msgstr "Неизвестный коммит %s" -#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 -#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 -#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 -#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#: 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 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не удалось разрешить «%s» как ссылку." -#: builtin/log.c:1231 +#: builtin/log.c:1259 msgid "Could not find exact merge base." msgstr "Не удалось найти точную базу слияния." -#: builtin/log.c:1235 +#: builtin/log.c:1263 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную." -#: builtin/log.c:1255 +#: builtin/log.c:1283 msgid "Failed to find exact merge base" msgstr "Не удалось найти точную базу слияния" -#: builtin/log.c:1266 +#: builtin/log.c:1294 msgid "base commit should be the ancestor of revision list" msgstr "базовый коммит должен быть предком списка редакций" -#: builtin/log.c:1270 +#: builtin/log.c:1298 msgid "base commit shouldn't be in revision list" msgstr "базовый коммит не должен быть в списке редакций" -#: builtin/log.c:1319 +#: builtin/log.c:1347 msgid "cannot get patch id" msgstr "не удалось получить идентификатор патча" -#: builtin/log.c:1377 +#: builtin/log.c:1404 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1380 +#: builtin/log.c:1407 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда несколько патчей" -#: builtin/log.c:1384 +#: builtin/log.c:1411 msgid "print patches to standard out" msgstr "выводить патчи на стандартный вывод" -#: builtin/log.c:1386 +#: builtin/log.c:1413 msgid "generate a cover letter" msgstr "генерировать сопроводительное письмо" -#: builtin/log.c:1388 +#: builtin/log.c:1415 msgid "use simple number sequence for output file names" msgstr "использовать простую последовательность чисел для имен выходных файлов" -#: builtin/log.c:1389 +#: builtin/log.c:1416 msgid "sfx" msgstr "суффикс" -#: builtin/log.c:1390 +#: builtin/log.c:1417 msgid "use <sfx> instead of '.patch'" msgstr "использовать суффикс <суффикс> вместо «.patch»" -#: builtin/log.c:1392 +#: builtin/log.c:1419 msgid "start numbering patches at <n> instead of 1" msgstr "начать нумерацию патчей с <n>, а не с 1" -#: builtin/log.c:1394 +#: builtin/log.c:1421 msgid "mark the series as Nth re-roll" msgstr "пометить серию как энную попытку" -#: builtin/log.c:1396 +#: builtin/log.c:1423 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Использовать [<префикс>] вместо [PATCH]" -#: builtin/log.c:1399 +#: builtin/log.c:1426 msgid "store resulting files in <dir>" msgstr "сохранить результирующие файлы в <каталог>" -#: builtin/log.c:1402 +#: builtin/log.c:1429 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлять [PATCH]" -#: builtin/log.c:1405 +#: builtin/log.c:1432 msgid "don't output binary diffs" msgstr "не выводить двоичные различия" -#: builtin/log.c:1407 +#: builtin/log.c:1434 msgid "output all-zero hash in From header" msgstr "выводить нулевую хэш-сумму в заголовке From" -#: builtin/log.c:1409 +#: builtin/log.c:1436 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" -#: builtin/log.c:1411 +#: builtin/log.c:1438 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" -#: builtin/log.c:1413 +#: builtin/log.c:1440 msgid "Messaging" msgstr "Передача сообщений" -#: builtin/log.c:1414 +#: builtin/log.c:1441 msgid "header" msgstr "заголовок" -#: builtin/log.c:1415 +#: builtin/log.c:1442 msgid "add email header" msgstr "добавить заголовок сообщения" -#: builtin/log.c:1416 builtin/log.c:1418 +#: builtin/log.c:1443 builtin/log.c:1445 msgid "email" msgstr "почта" -#: builtin/log.c:1416 +#: builtin/log.c:1443 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1418 +#: builtin/log.c:1445 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1420 +#: builtin/log.c:1447 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1421 +#: builtin/log.c:1448 msgid "set From address to <ident> (or committer ident if absent)" msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" -#: builtin/log.c:1423 +#: builtin/log.c:1450 msgid "message-id" msgstr "идентификатор-сообщения" -#: builtin/log.c:1424 +#: builtin/log.c:1451 msgid "make first mail a reply to <message-id>" msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" -#: builtin/log.c:1425 builtin/log.c:1428 +#: builtin/log.c:1452 builtin/log.c:1455 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1426 +#: builtin/log.c:1453 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1429 +#: builtin/log.c:1456 msgid "inline the patch" msgstr "включить патч в текст письма" -#: builtin/log.c:1433 +#: builtin/log.c:1460 msgid "enable message threading, styles: shallow, deep" msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" -#: builtin/log.c:1435 +#: builtin/log.c:1462 msgid "signature" msgstr "подпись" -#: builtin/log.c:1436 +#: builtin/log.c:1463 msgid "add a signature" msgstr "добавить подпись" -#: builtin/log.c:1437 +#: builtin/log.c:1464 msgid "base-commit" msgstr "базовый коммит" -#: builtin/log.c:1438 +#: builtin/log.c:1465 msgid "add prerequisite tree info to the patch series" msgstr "добавить информацию о требовании дерева к серии патчей" -#: builtin/log.c:1440 +#: builtin/log.c:1467 msgid "add a signature from a file" msgstr "добавить подпись из файла" -#: builtin/log.c:1441 +#: builtin/log.c:1468 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1531 +#: builtin/log.c:1558 msgid "-n and -k are mutually exclusive." msgstr "-n и -k нельзя использовать одновременно" -#: builtin/log.c:1533 +#: builtin/log.c:1560 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix и -k нельзя использовать одновременно." -#: builtin/log.c:1541 +#: builtin/log.c:1568 msgid "--name-only does not make sense" msgstr "--name-only не имеет смысла" -#: builtin/log.c:1543 +#: builtin/log.c:1570 msgid "--name-status does not make sense" msgstr "--name-status не имеет смысла" -#: builtin/log.c:1545 +#: builtin/log.c:1572 msgid "--check does not make sense" msgstr "--check не имеет смысла" -#: builtin/log.c:1573 +#: builtin/log.c:1602 msgid "standard output, or directory, which one?" msgstr "стандартный вывод или каталог?" -#: builtin/log.c:1575 +#: builtin/log.c:1604 #, c-format msgid "Could not create directory '%s'" msgstr "Не удалось создать каталог «%s»" -#: builtin/log.c:1672 +#: builtin/log.c:1698 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалось прочитать файл подписи «%s»" -#: builtin/log.c:1743 +#: builtin/log.c:1769 msgid "Failed to create output files" msgstr "Сбой при создании выходных файлов" -#: builtin/log.c:1792 +#: builtin/log.c:1818 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]" -#: builtin/log.c:1846 +#: builtin/log.c:1872 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" -#: builtin/ls-files.c:378 +#: builtin/ls-files.c:379 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<опции>] [<файл>…]" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:428 msgid "identify the file status with tags" msgstr "выводить имена файлов с метками" -#: builtin/ls-files.c:429 +#: builtin/ls-files.c:430 msgid "use lowercase letters for 'assume unchanged' files" msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов" -#: builtin/ls-files.c:431 +#: builtin/ls-files.c:432 msgid "show cached files in the output (default)" msgstr "показывать кэшированные файлы при выводе (по умолчанию)" -#: builtin/ls-files.c:433 +#: builtin/ls-files.c:434 msgid "show deleted files in the output" msgstr "показывать удаленные файлы при выводе" -#: builtin/ls-files.c:435 +#: builtin/ls-files.c:436 msgid "show modified files in the output" msgstr "показывать измененные файлы при выводе" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:438 msgid "show other files in the output" msgstr "показывать другие файлы при выводе" -#: builtin/ls-files.c:439 +#: builtin/ls-files.c:440 msgid "show ignored files in the output" msgstr "показывать игнорируемые файлы при выводе" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:443 msgid "show staged contents' object name in the output" msgstr "показывать имя индексированного объекта на выводе" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:445 msgid "show files on the filesystem that need to be removed" msgstr "показывать файлы в файловой системе, которые должны быть удалены" -#: builtin/ls-files.c:446 +#: builtin/ls-files.c:447 msgid "show 'other' directories' names only" msgstr "показывать только имена у «других» каталогов" -#: builtin/ls-files.c:448 +#: builtin/ls-files.c:449 msgid "show line endings of files" msgstr "показать концы строк файлов" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:451 msgid "don't show empty directories" msgstr "не показывать пустые каталоги" -#: builtin/ls-files.c:453 +#: builtin/ls-files.c:454 msgid "show unmerged files in the output" msgstr "показывать не слитые файлы на выводе" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:456 msgid "show resolve-undo information" msgstr "показывать информации о разрешении конфликтов и отмене" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:458 msgid "skip files matching pattern" msgstr "пропустить файлы, соответствующие шаблону" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:461 msgid "exclude patterns are read from <file>" msgstr "прочитать шаблоны исключения из <файл>" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:464 msgid "read additional per-directory exclude patterns in <file>" msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:466 msgid "add the standard git exclusions" msgstr "добавить стандартные исключения git" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "make the output relative to the project top directory" msgstr "выводить пути относительно корневого каталога проекта" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:472 msgid "if any <file> is not in the index, treat this as an error" msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:473 msgid "tree-ish" msgstr "указатель-дерева" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:474 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:476 msgid "show debugging data" msgstr "показать отладочную информацию" @@ -7752,186 +8073,172 @@ msgstr "использовать полные пути" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<опции>] [<коммит>…]" -#: builtin/merge.c:46 +#: builtin/merge.c:47 msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "git merge [<опции>] <сообщение> HEAD <коммит>" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:101 +#: builtin/merge.c:102 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуется указать значение" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Не удалось найти стратегию слияния «%s».\n" -#: builtin/merge.c:139 +#: builtin/merge.c:140 #, c-format msgid "Available strategies are:" msgstr "Доступные стратегии:" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "Available custom strategies are:" msgstr "Доступные пользовательские стратегии:" -#: builtin/merge.c:194 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить статистику изменений после окончания слияния" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "вывести статистику изменений после окончания слияния" -#: builtin/merge.c:198 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(синоним для --stat)" -#: builtin/merge.c:200 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" -#: builtin/merge.c:203 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "создать один коммит, вместо выполнения слияния" -#: builtin/merge.c:205 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" -#: builtin/merge.c:207 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:144 msgid "edit message before committing" msgstr "отредактировать сообщение перед выполнением коммита" -#: builtin/merge.c:208 +#: builtin/merge.c:209 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:210 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение слияния, если перемотка вперед невозможна" -#: builtin/merge.c:214 -msgid "Verify that the named commit has a valid GPG signature" -msgstr "Проверить, что указанный коммит имеет верную электронную подпись GPG" +#: builtin/merge.c:215 builtin/pull.c:153 +msgid "verify that the named commit has a valid GPG signature" +msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:158 msgid "merge strategy to use" msgstr "используемая стратегия слияния" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:161 msgid "option=value" msgstr "опция=значение" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "опции для выбранной стратегии слияния" -#: builtin/merge.c:220 +#: builtin/merge.c:221 msgid "merge commit message (for a non-fast-forward merge)" msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" -#: builtin/merge.c:224 +#: builtin/merge.c:225 msgid "abort the current in-progress merge" msgstr "отменить выполнение происходящего слияния" -#: builtin/merge.c:226 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:169 msgid "allow merging unrelated histories" msgstr "разрешить слияние несвязанных историй изменений" -#: builtin/merge.c:254 +#: builtin/merge.c:255 msgid "could not run stash." msgstr "не удалось выполнить stash." -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "stash failed" msgstr "сбой при выполнении stash" -#: builtin/merge.c:264 +#: builtin/merge.c:265 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:283 builtin/merge.c:300 +#: builtin/merge.c:284 builtin/merge.c:301 msgid "read-tree failed" msgstr "сбой при выполнении read-tree" -#: builtin/merge.c:330 +#: builtin/merge.c:331 msgid " (nothing to squash)" msgstr " (нечего уплотнять)" -#: builtin/merge.c:343 +#: builtin/merge.c:342 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновляя HEAD\n" -#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 -#: builtin/merge.c:1000 -#, c-format -msgid "Could not write to '%s'" -msgstr "Не удалось записать в «%s»" - -#: builtin/merge.c:375 -msgid "Writing SQUASH_MSG" -msgstr "Запись SQUASH_MSG" - -#: builtin/merge.c:377 -msgid "Finishing SQUASH_MSG" -msgstr "Завершение SQUASH_MSG" - -#: builtin/merge.c:400 +#: builtin/merge.c:392 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Нет сообщения слияния — не обновляем HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:443 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:541 +#: builtin/merge.c:533 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправильная строка branch.%s.mergeoptions: %s" -#: builtin/merge.c:660 +#: builtin/merge.c:652 msgid "Not handling anything other than two heads merge." msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." -#: builtin/merge.c:674 +#: builtin/merge.c:666 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Неизвестный параметр merge-recursive: -X%s" -#: builtin/merge.c:687 +#: builtin/merge.c:681 #, c-format msgid "unable to write %s" msgstr "не удалось записать %s" -#: builtin/merge.c:776 +#: builtin/merge.c:733 #, c-format msgid "Could not read from '%s'" msgstr "Не удалось прочесть из «%s»" -#: builtin/merge.c:785 +#: builtin/merge.c:742 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" -#: builtin/merge.c:791 +#: builtin/merge.c:748 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7941,161 +8248,183 @@ msgid "" "the commit.\n" msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n" -#: builtin/merge.c:815 +#: builtin/merge.c:772 msgid "Empty commit message." msgstr "Пустое сообщение коммита." -#: builtin/merge.c:835 +#: builtin/merge.c:792 #, c-format msgid "Wonderful.\n" msgstr "Прекрасно.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:847 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:863 #, c-format msgid "'%s' is not a commit" msgstr "«%s» не является коммитом" -#: builtin/merge.c:947 +#: builtin/merge.c:904 msgid "No current branch." msgstr "Нет текущей ветки." -#: builtin/merge.c:949 +#: builtin/merge.c:906 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозитория." -#: builtin/merge.c:951 +#: builtin/merge.c:908 msgid "No default upstream defined for the current branch." msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." -#: builtin/merge.c:956 +#: builtin/merge.c:913 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" -#: builtin/merge.c:1091 +#: builtin/merge.c:960 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "Плохое значение «%s» в переменной окружения «%s»" + +#: builtin/merge.c:1034 #, c-format msgid "could not close '%s'" msgstr "не удалось закрыть «%s»" -#: builtin/merge.c:1219 +#: builtin/merge.c:1061 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "не является тем, что можно слить в %s: %s" + +#: builtin/merge.c:1095 +msgid "not something we can merge" +msgstr "не является тем, что можно слить" + +#: builtin/merge.c:1162 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1235 +#: builtin/merge.c:1178 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." -#: builtin/merge.c:1242 +#: builtin/merge.c:1185 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием." -#: builtin/merge.c:1245 +#: builtin/merge.c:1188 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1254 +#: builtin/merge.c:1197 msgid "You cannot combine --squash with --no-ff." msgstr "Нельзя использовать одновременно --squash и --no-ff." -#: builtin/merge.c:1262 +#: builtin/merge.c:1205 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." -#: builtin/merge.c:1279 +#: builtin/merge.c:1222 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" -#: builtin/merge.c:1281 +#: builtin/merge.c:1224 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." -#: builtin/merge.c:1286 +#: builtin/merge.c:1229 #, c-format msgid "%s - not something we can merge" msgstr "%s не является тем, что можно слить" -#: builtin/merge.c:1288 +#: builtin/merge.c:1231 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -#: builtin/merge.c:1344 +#: builtin/merge.c:1287 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." -#: builtin/merge.c:1347 +#: builtin/merge.c:1290 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." -#: builtin/merge.c:1350 +#: builtin/merge.c:1293 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Коммит %s не содержит GPG подпись." -#: builtin/merge.c:1353 +#: builtin/merge.c:1296 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" -#: builtin/merge.c:1415 +#: builtin/merge.c:1358 msgid "refusing to merge unrelated histories" msgstr "отказ слияния несвязанных историй изменений" -#: builtin/merge.c:1439 +#: builtin/merge.c:1367 +msgid "Already up-to-date." +msgstr "Уже обновлено." + +#: builtin/merge.c:1382 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1476 +#: builtin/merge.c:1419 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе…\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1426 #, c-format msgid "Nope.\n" msgstr "Не вышло.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1451 +msgid "Already up-to-date. Yeeah!" +msgstr "Уже обновлено. Круто!" + +#: builtin/merge.c:1457 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1538 builtin/merge.c:1617 +#: builtin/merge.c:1480 builtin/merge.c:1559 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к исходному состоянию…\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1484 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка слияния с помощью стратегии %s…\n" -#: builtin/merge.c:1608 +#: builtin/merge.c:1550 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ни одна стратегия слияния не обработала слияние.\n" -#: builtin/merge.c:1610 +#: builtin/merge.c:1552 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при слиянии с помощью стратегии %s.\n" -#: builtin/merge.c:1619 +#: builtin/merge.c:1561 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" -#: builtin/merge.c:1631 +#: builtin/merge.c:1573 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" @@ -8220,68 +8549,68 @@ msgstr "принудительно перемещать/переименоват msgid "skip move/rename errors" msgstr "пропускать ошибки при перемещении/переименовании" -#: builtin/mv.c:152 +#: builtin/mv.c:155 #, c-format msgid "destination '%s' is not a directory" msgstr "целевой путь «%s» не является каталогом" -#: builtin/mv.c:163 +#: builtin/mv.c:166 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка переименования из «%s» в «%s»\n" -#: builtin/mv.c:167 +#: builtin/mv.c:170 msgid "bad source" msgstr "плохой источник" -#: builtin/mv.c:170 +#: builtin/mv.c:173 msgid "can not move directory into itself" msgstr "нельзя переместить каталог в самого себя" -#: builtin/mv.c:173 +#: builtin/mv.c:176 msgid "cannot move directory over file" msgstr "нельзя переместить каталог в файл" -#: builtin/mv.c:182 +#: builtin/mv.c:185 msgid "source directory is empty" msgstr "исходный каталог пуст" -#: builtin/mv.c:207 +#: builtin/mv.c:210 msgid "not under version control" msgstr "не под версионным контролем" -#: builtin/mv.c:210 +#: builtin/mv.c:213 msgid "destination exists" msgstr "целевой путь уже существует" -#: builtin/mv.c:218 +#: builtin/mv.c:221 #, c-format msgid "overwriting '%s'" msgstr "перезапись «%s»" -#: builtin/mv.c:221 +#: builtin/mv.c:224 msgid "Cannot overwrite" msgstr "Не удалось перезаписать" -#: builtin/mv.c:224 +#: builtin/mv.c:227 msgid "multiple sources for the same target" msgstr "несколько источников для одного целевого пути" -#: builtin/mv.c:226 +#: builtin/mv.c:229 msgid "destination directory does not exist" msgstr "целевой каталог не существует" -#: builtin/mv.c:233 +#: builtin/mv.c:236 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, откуда=%s, куда=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:257 #, c-format msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 #, c-format msgid "renaming '%s' failed" msgstr "сбой при переименовании «%s»" @@ -8431,6 +8760,10 @@ msgstr "git notes prune [<опции>]" msgid "git notes get-ref" msgstr "git notes get-ref" +#: builtin/notes.c:94 +msgid "Write/edit the notes for the following object:" +msgstr "Записать/изменить заметки для следующего объекта:" + #: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" @@ -8445,184 +8778,218 @@ msgstr "не удалось прочитать вывод «show»" msgid "failed to finish 'show' for object '%s'" msgstr "не удалось завершить «show» для объекта «%s»" -#: builtin/notes.c:174 builtin/tag.c:248 -#, c-format -msgid "could not create file '%s'" -msgstr "не удалось создать файл «%s»" - -#: builtin/notes.c:193 +#: builtin/notes.c:194 msgid "Please supply the note contents using either -m or -F option" msgstr "Пожалуйста, укажите содержимое заметки, используя опцию -m или -F" -#: builtin/notes.c:202 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "не удалось записать объект заметки" -#: builtin/notes.c:204 +#: builtin/notes.c:205 #, c-format msgid "The note contents have been left in %s" msgstr "Содержимое заметки осталось в %s" -#: builtin/notes.c:232 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/notes.c:234 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "не удалось открыть или прочитать «%s»" -#: builtin/notes.c:256 +#: builtin/notes.c:257 #, c-format msgid "Failed to read object '%s'." msgstr "Не удалось прочитать объект «%s»." -#: builtin/notes.c:260 +#: builtin/notes.c:261 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "Не удалось прочитать данные заметки из недвоичного объекта «%s»." -#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 -#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:946 +#: 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 msgid "too many parameters" msgstr "передано слишком много параметров" -#: builtin/notes.c:375 builtin/notes.c:662 +#: builtin/notes.c:376 builtin/notes.c:663 #, c-format msgid "No note found for object %s." msgstr "Не найдена заметка для объекта %s." -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:397 builtin/notes.c:560 msgid "note contents as a string" msgstr "текстовое содержимое заметки" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:400 builtin/notes.c:563 msgid "note contents in a file" msgstr "содержимое заметки в файле" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "reuse and edit specified note object" msgstr "использовать и отредактировать указанный объект заметки" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "reuse specified note object" msgstr "использовать указанный объект заметки" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "allow storing empty note" msgstr "разрешить сохранение пустой заметки" -#: builtin/notes.c:409 builtin/notes.c:480 +#: builtin/notes.c:410 builtin/notes.c:481 msgid "replace existing notes" msgstr "заменить существующие заметки" -#: builtin/notes.c:434 +#: builtin/notes.c:435 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." -#: builtin/notes.c:449 builtin/notes.c:528 +#: builtin/notes.c:450 builtin/notes.c:529 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Перезапись существующих заметок у объекта %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 +#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 #, c-format msgid "Removing note for object %s\n" msgstr "Удаление заметки у объекта %s\n" -#: builtin/notes.c:481 +#: builtin/notes.c:482 msgid "read objects from stdin" msgstr "прочитать объекты из стандартного ввода" -#: builtin/notes.c:483 +#: builtin/notes.c:484 msgid "load rewriting config for <command> (implies --stdin)" msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)" -#: builtin/notes.c:501 +#: builtin/notes.c:502 msgid "too few parameters" msgstr "передано слишком мало параметров" -#: builtin/notes.c:522 +#: builtin/notes.c:523 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" " existing notes" msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." -#: builtin/notes.c:534 +#: builtin/notes.c:535 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Нет заметок у исходного объекта %s. Нельзя скопировать." -#: builtin/notes.c:586 +#: builtin/notes.c:587 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n" -#: builtin/notes.c:768 +#: builtin/notes.c:753 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "неизвестная стратегия слияния заметок %s" + +#: builtin/notes.c:769 msgid "General options" msgstr "Общие опции" -#: builtin/notes.c:770 +#: builtin/notes.c:771 msgid "Merge options" msgstr "Опции слияния" -#: builtin/notes.c:772 +#: builtin/notes.c:773 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:774 +#: builtin/notes.c:775 msgid "Committing unmerged notes" msgstr "Коммит не слитых заметок" -#: builtin/notes.c:776 +#: builtin/notes.c:777 msgid "finalize notes merge by committing unmerged notes" msgstr "завершить слияние заметок коммитом не слитых заметок" -#: builtin/notes.c:778 +#: builtin/notes.c:779 msgid "Aborting notes merge resolution" msgstr "Отмена разрешения слияния заметок" -#: builtin/notes.c:780 +#: builtin/notes.c:781 msgid "abort notes merge" msgstr "отменить слияние заметок" -#: builtin/notes.c:857 +#: builtin/notes.c:792 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy" + +#: builtin/notes.c:797 +msgid "Must specify a notes ref to merge" +msgstr "Вы должны указать ссылку заметки для слияния" + +#: builtin/notes.c:821 +#, c-format +msgid "Unknown -s/--strategy: %s" +msgstr "Неизвестный параметр для -s/--strategy: %s" + +#: builtin/notes.c:858 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Слияние заметок в %s уже выполняется на %s" -#: builtin/notes.c:884 +#: builtin/notes.c:861 +#, c-format +msgid "Failed to store link to current notes ref (%s)" +msgstr "Не удалось сохранить адрес текущей ссылки на заметку (%s)" + +#: builtin/notes.c:863 +#, c-format +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with" +" 'git notes merge --commit', or abort the merge with 'git notes merge " +"--abort'.\n" +msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n" + +#: builtin/notes.c:885 #, c-format msgid "Object %s has no note\n" msgstr "У объекта %s нет заметки\n" -#: builtin/notes.c:896 +#: builtin/notes.c:897 msgid "attempt to remove non-existent note is not an error" msgstr "попытка удаления несуществующей заметки не является ошибкой" -#: builtin/notes.c:899 +#: builtin/notes.c:900 msgid "read object names from the standard input" msgstr "прочитать имена объектов из стандартного ввода" -#: builtin/notes.c:980 +#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +msgid "do not remove, show only" +msgstr "не удалять, только показать список" + +#: builtin/notes.c:939 +msgid "report pruned notes" +msgstr "вывести список удаленных заметок" + +#: builtin/notes.c:981 msgid "notes-ref" msgstr "ссылка-на-заметку" -#: builtin/notes.c:981 +#: builtin/notes.c:982 msgid "use notes from <notes-ref>" msgstr "использовать заметку из <ссылка-на-заметку>" -#: builtin/notes.c:1016 builtin/remote.c:1628 +#: builtin/notes.c:1017 builtin/remote.c:1623 #, c-format msgid "Unknown subcommand: %s" msgstr "Неизвестная подкоманда: %s" @@ -8637,174 +9004,178 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "ошибка сжатия (%d)" -#: builtin/pack-objects.c:763 +#: builtin/pack-objects.c:766 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "Запись объектов" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1037 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:2177 +#: builtin/pack-objects.c:2197 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2563 +#: builtin/pack-objects.c:2611 #, c-format msgid "unsupported index version %s" msgstr "неподдерживаемая версия индекса %s" -#: builtin/pack-objects.c:2567 +#: builtin/pack-objects.c:2615 #, c-format msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2645 msgid "do not show progress meter" msgstr "не выводить прогресс выполнения" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2647 msgid "show progress meter" msgstr "показать прогресс выполнения" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2649 msgid "show progress meter during object writing phase" msgstr "показать прогресс выполнения во время записи объектов" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2652 msgid "similar to --all-progress when progress meter is shown" msgstr "похоже на --all-progress при включенном прогрессе выполнения" -#: builtin/pack-objects.c:2605 +#: builtin/pack-objects.c:2653 msgid "version[,offset]" msgstr "версия[,смещение]" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2654 msgid "write the pack index file in the specified idx format version" msgstr "записать файл индекса пакета в указанной версии формата" -#: builtin/pack-objects.c:2609 +#: builtin/pack-objects.c:2657 msgid "maximum size of each output pack file" msgstr "максимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2659 msgid "ignore borrowed objects from alternate object store" msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:2613 +#: builtin/pack-objects.c:2661 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2663 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеству объектов" -#: builtin/pack-objects.c:2617 +#: builtin/pack-objects.c:2665 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2667 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2669 msgid "reuse existing deltas" msgstr "использовать повторно существующие дельты" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2671 msgid "reuse existing objects" msgstr "использовать повторно существующие объекты" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2673 msgid "use OFS_DELTA objects" msgstr "использовать объекты OFS_DELTA" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2675 msgid "use threads when searching for best delta matches" msgstr "использовать многопоточность при поиске лучших совпадений дельт" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2677 msgid "do not create an empty pack output" msgstr "не создавать пустые выходные пакеты" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2679 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из стандартного ввода" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2681 msgid "limit the objects to those that are not yet packed" msgstr "ограничиться объектами, которые еще не упакованы" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2684 msgid "include objects reachable from any reference" msgstr "включить объекты, которые достижимы по любой из ссылок" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2687 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ссылаются записи журнала ссылок" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2690 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ссылается индекс" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2693 msgid "output pack to stdout" msgstr "вывести пакет на стандартный вывод" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2695 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2697 msgid "keep unreachable objects" msgstr "сохранять ссылки на недоступные объекты" -#: builtin/pack-objects.c:2650 parse-options.h:142 +#: builtin/pack-objects.c:2699 +msgid "pack loose unreachable objects" +msgstr "паковать недостижимые объекты" + +#: builtin/pack-objects.c:2700 parse-options.h:142 msgid "time" msgstr "время" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2701 msgid "unpack unreachable objects newer than <time>" msgstr "распаковать недоступные объекты, которые новее, чем <время>" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2704 msgid "create thin packs" msgstr "создавать тонкие пакеты" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2706 msgid "create packs suitable for shallow fetches" msgstr "создавать пакеты, подходящие для частичных извлечений" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2708 msgid "ignore packs that have companion .keep file" msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2710 msgid "pack compression level" msgstr "уровень сжатия пакета" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2712 msgid "do not hide commits by grafts" msgstr "не скрывать коммиты сращениями" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2714 msgid "use a bitmap index if available to speed up counting objects" msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2716 msgid "write a bitmap index together with the pack index" msgstr "запись индекса в битовых картах вместе с индексом пакета" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2829 msgid "Counting objects" msgstr "Подсчет объектов" @@ -8832,15 +9203,11 @@ msgstr "Удаление дублирующихся объектов" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <время>] [--] [<имя-ветки>…]" -#: builtin/prune.c:105 builtin/worktree.c:125 -msgid "do not remove, show only" -msgstr "не удалять, только показать список" - -#: builtin/prune.c:106 builtin/worktree.c:126 +#: builtin/prune.c:106 builtin/worktree.c:128 msgid "report pruned objects" msgstr "вывести список удаленных объектов" -#: builtin/prune.c:109 builtin/worktree.c:128 +#: builtin/prune.c:109 builtin/worktree.c:130 msgid "expire objects older than <time>" msgstr "удалить объекты старее чем <дата-окончания>" @@ -8860,14 +9227,10 @@ msgstr "Опции, связанные со слиянием" msgid "incorporate changes by rebasing rather than merging" msgstr "забрать изменения с помощью перебазирования, а не слияния" -#: builtin/pull.c:147 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:101 msgid "allow fast-forward" msgstr "разрешить перемотку вперед" -#: builtin/pull.c:153 -msgid "verify that the named commit has a valid GPG signature" -msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" - #: builtin/pull.c:156 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматически выполнять stash/stash pop до и после перемещения" @@ -8885,15 +9248,15 @@ msgstr "количество подмодулей, которые будут п msgid "Invalid value for pull.ff: %s" msgstr "Неправильное значение для pull.ff: %s" -#: builtin/pull.c:379 +#: builtin/pull.c:379 git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения." -#: builtin/pull.c:385 +#: builtin/pull.c:385 git-sh-setup.sh:252 msgid "Additionally, your index contains uncommitted changes." msgstr "К тому же, в вашем индексе есть незакоммиченные изменения." -#: builtin/pull.c:387 +#: builtin/pull.c:387 git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения." @@ -8943,7 +9306,7 @@ msgstr "Для дополнительной информации, смотрит msgid "<remote>" msgstr "<внешний-репозиторий>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ветка>" @@ -8964,15 +9327,19 @@ msgid "" "from the remote, but no such ref was fetched." msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена." -#: builtin/pull.c:864 +#: builtin/pull.c:820 +msgid "ignoring --verify-signatures for rebase" +msgstr "игнорирование --verify-signatures при перемещении" + +#: builtin/pull.c:867 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash можно использовать только вместе с --rebase." -#: builtin/pull.c:872 +#: builtin/pull.c:875 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс." -#: builtin/pull.c:900 +#: builtin/pull.c:903 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8980,7 +9347,7 @@ msgid "" "commit %s." msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s." -#: builtin/pull.c:905 +#: builtin/pull.c:908 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8991,11 +9358,11 @@ msgid "" "to recover." msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния." -#: builtin/pull.c:920 +#: builtin/pull.c:923 msgid "Cannot merge multiple branches into empty head." msgstr "Нельзя слить несколько веток в пустой указатель на ветку." -#: builtin/pull.c:924 +#: builtin/pull.c:927 msgid "Cannot rebase onto multiple branches." msgstr "Невозможно переместить над несколькими ветками." @@ -9115,12 +9482,12 @@ msgstr "Отправка в %s\n" msgid "failed to push some refs to '%s'" msgstr "не удалось отправить некоторые ссылки в «%s»" -#: builtin/push.c:365 +#: builtin/push.c:366 #, c-format msgid "bad repository '%s'" msgstr "плохой репозитория «%s»" -#: builtin/push.c:366 +#: builtin/push.c:367 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote repository using\n" @@ -9132,103 +9499,115 @@ msgid "" " git push <name>\n" msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n" -#: builtin/push.c:381 +#: builtin/push.c:385 msgid "--all and --tags are incompatible" msgstr "--all и --tags нельзя использовать одновременно" -#: builtin/push.c:382 +#: builtin/push.c:386 msgid "--all can't be combined with refspecs" msgstr "--all нельзя использовать вместе со спецификациями ссылок" -#: builtin/push.c:387 +#: builtin/push.c:391 msgid "--mirror and --tags are incompatible" msgstr "--mirror и --tags нельзя использовать одновременно" -#: builtin/push.c:388 +#: builtin/push.c:392 msgid "--mirror can't be combined with refspecs" msgstr "--mirror нельзя использовать вместе со спецификациями ссылок" -#: builtin/push.c:393 +#: builtin/push.c:397 msgid "--all and --mirror are incompatible" msgstr "--all и --mirror нельзя использовать одновременно" -#: builtin/push.c:505 +#: builtin/push.c:515 msgid "repository" msgstr "репозиторий" -#: builtin/push.c:506 builtin/send-pack.c:161 +#: builtin/push.c:516 builtin/send-pack.c:161 msgid "push all refs" msgstr "отправить все ссылки" -#: builtin/push.c:507 builtin/send-pack.c:163 +#: builtin/push.c:517 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "сделать зеркало всех ссылок" -#: builtin/push.c:509 +#: builtin/push.c:519 msgid "delete refs" msgstr "удалить ссылки" -#: builtin/push.c:510 +#: builtin/push.c:520 msgid "push tags (can't be used with --all or --mirror)" msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)" -#: builtin/push.c:513 builtin/send-pack.c:164 +#: builtin/push.c:523 builtin/send-pack.c:164 msgid "force updates" msgstr "принудительное обновление" -#: builtin/push.c:515 builtin/send-pack.c:175 +#: builtin/push.c:525 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "имя-ссылки>:<ожидается" -#: builtin/push.c:516 builtin/send-pack.c:176 +#: builtin/push.c:526 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "требовать, чтобы старое значение ссылки было ожидаемым" -#: builtin/push.c:519 +#: builtin/push.c:529 msgid "control recursive pushing of submodules" msgstr "управление рекурсивной отправкой подмодулей" -#: builtin/push.c:521 builtin/send-pack.c:169 +#: builtin/push.c:531 builtin/send-pack.c:169 msgid "use thin pack" msgstr "использовать тонкие пакеты" -#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 +#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "путь к программе упаковки на сервере" -#: builtin/push.c:524 +#: builtin/push.c:534 msgid "set upstream for git pull/status" msgstr "установить вышестоящую ветку для git pull/status" -#: builtin/push.c:527 +#: builtin/push.c:537 msgid "prune locally removed refs" msgstr "почистить локально удаленные ссылки" -#: builtin/push.c:529 +#: builtin/push.c:539 msgid "bypass pre-push hook" -msgstr "пропустить перехватчик перед-отправкой" +msgstr "пропустить перехватчик pre-push" -#: builtin/push.c:530 +#: builtin/push.c:540 msgid "push missing but relevant tags" msgstr "отправить пропущенные, но нужные метки" -#: builtin/push.c:533 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "подписать отправку с помощью GPG" -#: builtin/push.c:535 builtin/send-pack.c:170 +#: builtin/push.c:545 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "запросить выполнение атомарной транзакции на внешней стороне" -#: builtin/push.c:549 +#: builtin/push.c:546 +msgid "server-specific" +msgstr "зависит-от-сервера" + +#: builtin/push.c:546 +msgid "option to transmit" +msgstr "передаваемые опции" + +#: builtin/push.c:560 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete несовместимо с --all, --mirror и --tags" -#: builtin/push.c:551 +#: builtin/push.c:562 msgid "--delete doesn't make sense without any refs" msgstr "--delete не имеет смысла без указания ссылок" +#: builtin/push.c:579 +msgid "push options must not have new line characters" +msgstr "опции для отправки не должны содержать символы перевода строк" + #: builtin/read-tree.c:37 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)" @@ -9304,11 +9683,11 @@ msgstr "отладка unpack-trees" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <каталог-git>" -#: builtin/receive-pack.c:1719 +#: builtin/receive-pack.c:1843 msgid "quiet" msgstr "тихий режим" -#: builtin/receive-pack.c:1733 +#: builtin/receive-pack.c:1857 msgid "You must specify a directory." msgstr "Вы должны указать каталог." @@ -9453,12 +9832,12 @@ msgstr "указание мастер ветки не имеет смысла с msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении" -#: builtin/remote.c:190 builtin/remote.c:633 +#: builtin/remote.c:190 builtin/remote.c:629 #, c-format msgid "remote %s already exists." msgstr "внешний репозиторий %s уже существует" -#: builtin/remote.c:194 builtin/remote.c:637 +#: builtin/remote.c:194 builtin/remote.c:633 #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» не является допустимым именем внешнего репозитория." @@ -9481,17 +9860,17 @@ msgstr "(соответствующая)" msgid "(delete)" msgstr "(удаленная)" -#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 #, c-format msgid "No such remote: %s" msgstr "Нет такого внешнего репозитория: %s" -#: builtin/remote.c:643 +#: builtin/remote.c:639 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»" -#: builtin/remote.c:663 +#: builtin/remote.c:659 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9499,17 +9878,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "Не обновляю нестандартную спецификацию ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную." -#: builtin/remote.c:699 +#: builtin/remote.c:695 #, c-format msgid "deleting '%s' failed" msgstr "не удалось удалить «%s»" -#: builtin/remote.c:733 +#: builtin/remote.c:729 #, c-format msgid "creating '%s' failed" msgstr "не удалось создать «%s»" -#: builtin/remote.c:796 +#: builtin/remote.c:792 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9521,145 +9900,155 @@ msgstr[1] "Примечание: Некоторые ветки вне иерар msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" -#: builtin/remote.c:810 +#: builtin/remote.c:806 #, c-format msgid "Could not remove config section '%s'" msgstr "Не удалось удалить секцию файла конфигурации «%s»" -#: builtin/remote.c:911 +#: builtin/remote.c:907 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " новая (следующее извлечение сохранит ее в remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:910 msgid " tracked" msgstr " отслеживается" -#: builtin/remote.c:916 +#: builtin/remote.c:912 msgid " stale (use 'git remote prune' to remove)" msgstr " недействительна (используйте «git remote prune», чтобы удалить)" -#: builtin/remote.c:918 +#: builtin/remote.c:914 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:955 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой" -#: builtin/remote.c:967 +#: builtin/remote.c:963 #, c-format msgid "rebases interactively onto remote %s" msgstr "перемещается интерактивно над внешней веткой %s" -#: builtin/remote.c:971 +#: builtin/remote.c:964 +#, c-format +msgid "rebases onto remote %s" +msgstr "перемещается над внешней веткой %s" + +#: builtin/remote.c:967 #, c-format msgid " merges with remote %s" msgstr " будет слита с внешней веткой %s" -#: builtin/remote.c:972 -msgid " and with remote" -msgstr " и с внешней веткой" - -#: builtin/remote.c:974 +#: builtin/remote.c:970 #, c-format msgid "merges with remote %s" msgstr "будет слита с внешней веткой %s" -#: builtin/remote.c:975 -msgid " and with remote" -msgstr " и с внешней веткой" +#: builtin/remote.c:973 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s и с внешней веткой %s\n" -#: builtin/remote.c:1021 +#: builtin/remote.c:1016 msgid "create" msgstr "создана" -#: builtin/remote.c:1024 +#: builtin/remote.c:1019 msgid "delete" msgstr "удалена" -#: builtin/remote.c:1028 +#: builtin/remote.c:1023 msgid "up to date" msgstr "уже актуальна" -#: builtin/remote.c:1031 +#: builtin/remote.c:1026 msgid "fast-forwardable" msgstr "возможна перемотка вперед" -#: builtin/remote.c:1034 +#: builtin/remote.c:1029 msgid "local out of date" msgstr "локальная ветка устарела" -#: builtin/remote.c:1041 +#: builtin/remote.c:1036 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s будет принудительно отправлена в %-*s (%s)" -#: builtin/remote.c:1044 +#: builtin/remote.c:1039 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s будет отправлена в %-*s (%s)" -#: builtin/remote.c:1048 +#: builtin/remote.c:1043 #, c-format msgid " %-*s forces to %s" msgstr " %-*s будет принудительно отправлена в %s" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s будет отправлена в %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1114 msgid "do not query remotes" msgstr "не опрашивать внешние репозитории" -#: builtin/remote.c:1146 +#: builtin/remote.c:1141 #, c-format msgid "* remote %s" msgstr "* внешний репозиторий %s" -#: builtin/remote.c:1147 +#: builtin/remote.c:1142 #, c-format msgid " Fetch URL: %s" msgstr " URL для извлечения: %s" -#: builtin/remote.c:1148 builtin/remote.c:1301 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 msgid "(no URL)" msgstr "(нет URL)" #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1159 builtin/remote.c:1161 +#: builtin/remote.c:1154 builtin/remote.c:1156 #, c-format msgid " Push URL: %s" -msgstr " URL для отправки: %s" +msgstr " URL для отправки: %s" -#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 +#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ветка: %s" -#: builtin/remote.c:1169 +#: builtin/remote.c:1158 +msgid "(not queried)" +msgstr "(не запрашивался)" + +#: builtin/remote.c:1160 +msgid "(unknown)" +msgstr "(неизвестно)" + +#: builtin/remote.c:1164 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" -#: builtin/remote.c:1181 +#: builtin/remote.c:1176 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" -msgstr[0] " Внешняя ветка:%s" -msgstr[1] " Внешние ветки:%s" -msgstr[2] " Внешние ветки:%s" -msgstr[3] " Внешние ветки:%s" +msgstr[0] " Внешняя ветка:%s" +msgstr[1] " Внешние ветки:%s" +msgstr[2] " Внешние ветки:%s" +msgstr[3] " Внешние ветки:%s" -#: builtin/remote.c:1184 builtin/remote.c:1211 +#: builtin/remote.c:1179 builtin/remote.c:1206 msgid " (status not queried)" -msgstr " (статус не запрошен)" +msgstr " (статус не запрашивался)" -#: builtin/remote.c:1193 +#: builtin/remote.c:1188 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локальная ветка, настроенная для «git pull»:" @@ -9667,11 +10056,11 @@ msgstr[1] " Локальные ветки, настроенные для «git msgstr[2] " Локальные ветки, настроенные для «git pull»:" msgstr[3] " Локальные ветки, настроенные для «git pull»:" -#: builtin/remote.c:1201 +#: builtin/remote.c:1196 msgid " Local refs will be mirrored by 'git push'" msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" -#: builtin/remote.c:1208 +#: builtin/remote.c:1203 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -9680,128 +10069,128 @@ msgstr[1] " Локальные ссылки, настроенные для «gi msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" msgstr[3] " Локальные ссылки, настроенные для «git push»%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1224 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" -#: builtin/remote.c:1231 +#: builtin/remote.c:1226 msgid "delete refs/remotes/<name>/HEAD" msgstr "удалить refs/remotes/<имя>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1241 msgid "Cannot determine remote HEAD" msgstr "Не удалось определить внешний HEAD" -#: builtin/remote.c:1248 +#: builtin/remote.c:1243 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1253 #, c-format msgid "Could not delete %s" msgstr "Не удалось удалить %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1261 #, c-format msgid "Not a valid ref: %s" -msgstr "Неправильная ссылка: %s" +msgstr "Недопустимая ссылка: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1263 #, c-format msgid "Could not setup %s" msgstr "Не удалось настроить %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1281 #, c-format msgid " %s will become dangling!" msgstr " %s будет висящей веткой!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1282 #, c-format msgid " %s has become dangling!" msgstr " %s стала висящей веткой!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1292 #, c-format msgid "Pruning %s" -msgstr "Удаление %s" +msgstr "Очистка %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1293 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1309 #, c-format msgid " * [would prune] %s" msgstr " * [будет удалена] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1312 #, c-format msgid " * [pruned] %s" msgstr " * [удалена] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1357 msgid "prune remotes after fetching" msgstr "почистить внешние репозитории после извлечения" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 #, c-format msgid "No such remote '%s'" msgstr "Нет такого внешнего репозитория «%s»" -#: builtin/remote.c:1441 +#: builtin/remote.c:1436 msgid "add branch" msgstr "добавить ветку" -#: builtin/remote.c:1448 +#: builtin/remote.c:1443 msgid "no remote specified" msgstr "не указан внешний репозиторий" -#: builtin/remote.c:1465 +#: builtin/remote.c:1460 msgid "query push URLs rather than fetch URLs" msgstr "запросить URL отправки, вместо URL извлечения" -#: builtin/remote.c:1467 +#: builtin/remote.c:1462 msgid "return all URLs" msgstr "вернуть все URL" -#: builtin/remote.c:1495 +#: builtin/remote.c:1490 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL не настроены для внешнего репозитория «%s»" -#: builtin/remote.c:1521 +#: builtin/remote.c:1516 msgid "manipulate push URLs" msgstr "управление URL отправки" -#: builtin/remote.c:1523 +#: builtin/remote.c:1518 msgid "add URL" msgstr "добавить URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1520 msgid "delete URLs" msgstr "удалить URL" -#: builtin/remote.c:1532 +#: builtin/remote.c:1527 msgid "--add --delete doesn't make sense" msgstr "--add нельзя использовать одновременно с --delete" -#: builtin/remote.c:1573 +#: builtin/remote.c:1568 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправильный шаблон старого URL: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1576 #, c-format msgid "No such URL found: %s" msgstr "Не найдены совпадения URL: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1578 msgid "Will not delete all non-push URLs" msgstr "Нельзя удалить все URL не-отправки" -#: builtin/remote.c:1597 +#: builtin/remote.c:1592 msgid "be verbose; must be placed before a subcommand" msgstr "быть многословнее; должно стоять перед подкомандой" @@ -9809,78 +10198,86 @@ msgstr "быть многословнее; должно стоять перед msgid "git repack [<options>]" msgstr "git repack [<опции>]" -#: builtin/repack.c:159 +#: builtin/repack.c:160 msgid "pack everything in a single pack" msgstr "упаковать всё в один пакет" -#: builtin/repack.c:161 +#: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты" -#: builtin/repack.c:164 +#: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" msgstr "удалите лишние пакеты и запустите git-prune-packed" -#: builtin/repack.c:166 +#: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "передать опцию --no-reuse-delta в git-pack-objects" -#: builtin/repack.c:168 +#: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" msgstr "передать опцию --no-reuse-object в git-pack-objects" -#: builtin/repack.c:170 +#: builtin/repack.c:171 msgid "do not run git-update-server-info" msgstr "не запускать git-update-server-info" -#: builtin/repack.c:173 +#: builtin/repack.c:174 msgid "pass --local to git-pack-objects" msgstr "передать опцию --local в git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:176 msgid "write bitmap index" msgstr "запись индекса в битовых картах" -#: builtin/repack.c:176 +#: builtin/repack.c:177 msgid "approxidate" msgstr "примерная-дата" -#: builtin/repack.c:177 +#: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" msgstr "с опцией -A, не отбрасывать объекты старее, чем указано" -#: builtin/repack.c:179 +#: builtin/repack.c:180 +msgid "with -a, repack unreachable objects" +msgstr "с параметром -a, перепаковать недоступные объекты" + +#: builtin/repack.c:182 msgid "size of the window used for delta compression" msgstr "размер окна, используемый для компрессии дельт" -#: builtin/repack.c:180 builtin/repack.c:184 +#: builtin/repack.c:183 builtin/repack.c:187 msgid "bytes" msgstr "количество-байт" -#: builtin/repack.c:181 +#: builtin/repack.c:184 msgid "same as the above, but limit memory size instead of entries count" msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей" -#: builtin/repack.c:183 +#: builtin/repack.c:186 msgid "limits the maximum delta depth" msgstr "ограничение на максимальную глубину дельт" -#: builtin/repack.c:185 +#: builtin/repack.c:188 msgid "maximum size of each packfile" msgstr "максимальный размер каждого из файлов пакета" -#: builtin/repack.c:187 +#: builtin/repack.c:190 msgid "repack objects in packs marked with .keep" msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" -#: builtin/repack.c:197 +#: builtin/repack.c:200 msgid "cannot delete packs in a precious-objects repo" msgstr "нельзя удалять пакеты в precious-objects репозитории" -#: builtin/repack.c:381 +#: builtin/repack.c:204 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable и -A нельзя использовать одновременно" + +#: builtin/repack.c:391 builtin/worktree.c:115 #, c-format -msgid "removing '%s' failed" -msgstr "не удалось удалить «%s»" +msgid "failed to remove '%s'" +msgstr "сбой удаления «%s»" #: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" @@ -10099,7 +10496,7 @@ msgstr "Не удалось сбросить файл индекса на ред msgid "Could not write new index file." msgstr "Не удалось записать новый файл индекса." -#: builtin/rev-list.c:350 +#: builtin/rev-list.c:362 msgid "rev-list does not support display of notes" msgstr "rev-list не поддерживает отображение заметок" @@ -10185,31 +10582,27 @@ msgstr "опция" msgid "option for merge strategy" msgstr "опция для стратегии слияния" -#: builtin/revert.c:104 +#: builtin/revert.c:100 msgid "append commit name" msgstr "добавить имя коммита" -#: builtin/revert.c:106 +#: builtin/revert.c:102 msgid "preserve initially empty commits" msgstr "сохранить изначально пустые коммиты" -#: builtin/revert.c:107 +#: builtin/revert.c:103 msgid "allow commits with empty messages" msgstr "разрешить коммиты с пустыми сообщениями" -#: builtin/revert.c:108 +#: builtin/revert.c:104 msgid "keep redundant, empty commits" msgstr "оставить избыточные, пустые коммиты" -#: builtin/revert.c:112 -msgid "program error" -msgstr "ошибка в программе" - -#: builtin/revert.c:197 +#: builtin/revert.c:192 msgid "revert failed" msgstr "сбой обращения изменений коммита" -#: builtin/revert.c:212 +#: builtin/revert.c:207 msgid "cherry-pick failed" msgstr "сбой при копировании коммита" @@ -10485,12 +10878,12 @@ msgstr "пропустить и удалить все строки, начина msgid "prepend comment character and space to each line" msgstr "добавить перед каждой строкой символ комметария и пробел" -#: builtin/submodule--helper.c:24 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923 #, c-format msgid "No such ref: %s" msgstr "Нет такой ссылки: %s" -#: builtin/submodule--helper.c:31 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Ожидалось полное имя ссылки, а получено %s" @@ -10500,8 +10893,8 @@ msgstr "Ожидалось полное имя ссылки, а получено msgid "cannot strip one component off url '%s'" msgstr "не удалось обрезать один компонент url «%s»" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 +#: builtin/submodule--helper.c:483 msgid "alternative anchor for relative paths" msgstr "альтернативный символ для относительных путей" @@ -10509,151 +10902,172 @@ msgstr "альтернативный символ для относительн msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules" -#: builtin/submodule--helper.c:366 +#: builtin/submodule--helper.c:364 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Сбой регистрации адреса для пути подмодуля «%s»" -#: builtin/submodule--helper.c:370 +#: builtin/submodule--helper.c:368 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n" -#: builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:378 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:385 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»" -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:404 msgid "Suppress output for initializing a submodule" msgstr "Не выводить информацию о инициализации подмодуля" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:409 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<путь>]" -#: builtin/submodule--helper.c:432 +#: builtin/submodule--helper.c:430 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <путь>" -#: builtin/submodule--helper.c:438 +#: builtin/submodule--helper.c:436 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:486 msgid "where the new submodule will be cloned to" msgstr "куда должен быть склонирован новый подмодуль" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:489 msgid "name of the new submodule" msgstr "имя нового подмодуля" -#: builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:492 msgid "url where to clone the submodule from" msgstr "url откуда должен был склонирован новый подмодуль" -#: builtin/submodule--helper.c:501 +#: builtin/submodule--helper.c:498 msgid "depth for shallow clones" msgstr "глубина для частичного клона" -#: builtin/submodule--helper.c:507 +#: builtin/submodule--helper.c:504 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>" -#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 +#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 #, c-format msgid "could not create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/submodule--helper.c:534 +#: builtin/submodule--helper.c:531 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»" -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:547 #, c-format msgid "cannot open file '%s'" msgstr "не удалось открыть файл «%s»" -#: builtin/submodule--helper.c:555 +#: builtin/submodule--helper.c:552 #, c-format msgid "could not close file %s" msgstr "не удалось закрыть файл %s" -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:559 #, c-format msgid "could not get submodule directory for '%s'" msgstr "не удалось получить каталог для подмодуля «%s»" -#: builtin/submodule--helper.c:609 +#: builtin/submodule--helper.c:611 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Подмодуль по пути «%s» не инициализирован" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "Maybe you want to use 'update --init'?" msgstr "Возможно, вы хотели использовать «update --init»?" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:641 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Пропуск не слитого подмодуля %s" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "Skipping submodule '%s'" msgstr "Пропуск подмодуля «%s»" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:792 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "Не удалось клонировать «%s». Запланирована повторная попытка" + +#: builtin/submodule--helper.c:803 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "Не удалось клонировать «%s» со второй попытки, отмена" + +#: builtin/submodule--helper.c:824 msgid "path into the working tree" msgstr "путь в рабочем каталоге" -#: builtin/submodule--helper.c:771 +#: builtin/submodule--helper.c:827 msgid "path into the working tree, across nested submodule boundaries" msgstr "путь в рабочем каталоге, в пределах границ подмодуля" -#: builtin/submodule--helper.c:775 +#: builtin/submodule--helper.c:831 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout или none" -#: builtin/submodule--helper.c:779 +#: builtin/submodule--helper.c:835 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Создать частичный клон, ограниченный указанным количеством редакций" -#: builtin/submodule--helper.c:782 +#: builtin/submodule--helper.c:838 msgid "parallel jobs" msgstr "параллельные задачи" -#: builtin/submodule--helper.c:783 +#: builtin/submodule--helper.c:840 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности" + +#: builtin/submodule--helper.c:841 msgid "don't print cloning progress" msgstr "вы выводить прогресс клонирования" -#: builtin/submodule--helper.c:788 +#: builtin/submodule--helper.c:846 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:798 +#: builtin/submodule--helper.c:856 msgid "bad value for update parameter" msgstr "плохое значение для параметра update" -#: builtin/submodule--helper.c:855 +#: builtin/submodule--helper.c:927 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "Ветка подмодуля (%s) настроена на наследование ветки из родительского проекта, но он не находится ни на одной ветке" + +#: builtin/submodule--helper.c:977 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "подкоманда submodule--helper должна вызываться с указанием подкоманды" -#: builtin/submodule--helper.c:862 +#: builtin/submodule--helper.c:984 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» не является подкомандой submodule--helper" @@ -10981,14 +11395,6 @@ msgstr "<режим доступа>,<объект>,<путь>" msgid "add the specified entry to the index" msgstr "добавить указанную запись в индекс" -#: builtin/update-index.c:958 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/update-index.c:959 -msgid "override the executable bit of the listed files" -msgstr "переопределить бит выполнения на указанных файлах" - #: builtin/update-index.c:963 msgid "mark files as \"not changing\"" msgstr "пометить файлы как «не измененные»" @@ -11147,82 +11553,109 @@ msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<опции>] <путь> [<ветка>]" #: builtin/worktree.c:16 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<опции>]" + +#: builtin/worktree.c:17 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [<опции>] <путь>" + +#: builtin/worktree.c:18 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<опции>]" -#: builtin/worktree.c:17 -msgid "git worktree list [<options>]" -msgstr "git worktree list [<опции>]" +#: builtin/worktree.c:19 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock <путь>" -#: builtin/worktree.c:40 +#: builtin/worktree.c:42 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Удаление рабочих каталогов/%s: не является каталогом" -#: builtin/worktree.c:46 +#: builtin/worktree.c:48 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует" -#: builtin/worktree.c:51 +#: builtin/worktree.c:53 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)" -#: builtin/worktree.c:62 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir" -#: builtin/worktree.c:78 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение" -#: builtin/worktree.c:113 -#, c-format -msgid "failed to remove '%s'" -msgstr "сбой удаления «%s»" - -#: builtin/worktree.c:202 +#: builtin/worktree.c:204 #, c-format msgid "'%s' already exists" msgstr "«%s» уже существует" -#: builtin/worktree.c:234 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/worktree.c:270 +#: builtin/worktree.c:272 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготовка %s (идентификатор %s)" -#: builtin/worktree.c:322 +#: builtin/worktree.c:323 msgid "checkout <branch> even if already checked out in other worktree" msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге" -#: builtin/worktree.c:324 +#: builtin/worktree.c:325 msgid "create a new branch" msgstr "создать новую ветку" -#: builtin/worktree.c:326 +#: builtin/worktree.c:327 msgid "create or reset a branch" msgstr "создать или перейти на ветку" -#: builtin/worktree.c:327 -msgid "detach HEAD at named commit" -msgstr "отсоединить HEAD на указанном коммите" - -#: builtin/worktree.c:328 +#: builtin/worktree.c:329 msgid "populate the new working tree" msgstr "наполнить новый рабочий каталог" -#: builtin/worktree.c:336 +#: builtin/worktree.c:337 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B и --detach нельзя использовать одновременно" +#: builtin/worktree.c:470 +msgid "reason for locking" +msgstr "причина блокировки" + +#: builtin/worktree.c:482 builtin/worktree.c:515 +#, c-format +msgid "'%s' is not a working tree" +msgstr "«%s» не является рабочим каталогом" + +#: builtin/worktree.c:484 builtin/worktree.c:517 +msgid "The main working tree cannot be locked or unlocked" +msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован" + +#: builtin/worktree.c:489 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "«%s» уже заблокирован, причина: %s" + +#: builtin/worktree.c:491 +#, c-format +msgid "'%s' is already locked" +msgstr "«%s» уже заблокирован" + +#: builtin/worktree.c:519 +#, c-format +msgid "'%s' is not locked" +msgstr "«%s» не заблокирован" + #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]" @@ -11239,6 +11672,26 @@ msgstr "вывести объект дерева для подкаталога msgid "only useful for debugging" msgstr "используется только при отладке" +#: upload-pack.c:20 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<опции>] <каталог>" + +#: upload-pack.c:837 +msgid "quit after a single request/response exchange" +msgstr "выход после обмена одним запросом/ответом" + +#: upload-pack.c:839 +msgid "exit immediately after initial ref advertisement" +msgstr "выходить сразу после начального объявления списка ссылок" + +#: upload-pack.c:841 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git" + +#: upload-pack.c:843 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "прервать передачу после <кол> секунд простоя" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "вывод отладочных сообщений на stderr" @@ -11250,7 +11703,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." -#: http.c:322 +#: http.c:323 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning не поддерживается с cURL < 7.44.0" @@ -11382,58 +11835,59 @@ msgstr "использовать <n> цифр для вывода SHA-1" msgid "update the index with reused conflict resolution if possible" msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно" -#: git-bisect.sh:55 +#: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Вам нужно начать с помощью «git bisect start»" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:61 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? " -#: git-bisect.sh:122 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "неопознанная опция: «$arg»" -#: git-bisect.sh:126 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "«$arg» не похоже на действительную редакцию" -#: git-bisect.sh:155 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "Плохой указатель HEAD — Необходим указатель HEAD" -#: git-bisect.sh:168 +#: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <существующая-ветка>»." -#: git-bisect.sh:178 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek" -#: git-bisect.sh:182 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "Плохой указатель HEAD — странная символьная ссылка" -#: git-bisect.sh:234 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Плохой аргумент bisect_write: $state" -#: git-bisect.sh:263 +#: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" msgstr "Плохой ввод номера редакции: $arg" -#: git-bisect.sh:278 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "Пожалуйста, вызывайте «bisect_state» как минимум с одним аргументом." +#: git-bisect.sh:281 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "Плохой ввод номера редакции: $bisected_head" #: git-bisect.sh:290 #, sh-format @@ -11563,61 +12017,99 @@ msgid "" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "недопустимый аргумент $arg для «git bisect terms».\nПоддерживаемые параметры: --term-good|--term-old и --term-bad|--term-new." -#: git-rebase.sh:57 +#: git-merge-octopus.sh:46 +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "Ошибка: Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +msgstr "Не удалось автоматически слить изменения." + +#: git-merge-octopus.sh:62 +msgid "Should not be doing an Octopus." +msgstr "Должно быть octopus не подходит." + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "Не удалось найти общий коммит с $pretty_name" + +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up-to-date with $pretty_name" +msgstr "Уже обновлено в соответствии с $pretty_name" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "Перемотка вперед до: $pretty_name" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "Попытка простого слияния с $pretty_name" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "Простое слияние не удалось, попытка автоматического слияния." + +#: git-rebase.sh:56 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" "To check out the original branch and stop rebasing, run \"git rebase --abort\"." msgstr "Когда вы разрешите этот конфликт, запустите «git rebase --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»." -#: git-rebase.sh:168 +#: git-rebase.sh:156 git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Не удалось перейти назад на $head_name" + +#: git-rebase.sh:167 msgid "Applied autostash." msgstr "Применено автоматическое прятанье." -#: git-rebase.sh:171 +#: git-rebase.sh:170 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Не удалось сохранить $stash_sha1" -#: git-rebase.sh:172 +#: git-rebase.sh:171 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "Применение автоматического прятанья вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" -#: git-rebase.sh:211 +#: git-rebase.sh:210 msgid "The pre-rebase hook refused to rebase." -msgstr "Перехватчик пре-перемещения отказал в перемещении." +msgstr "Перехватчик pre-rebase отказал в перемещении." -#: git-rebase.sh:216 +#: git-rebase.sh:215 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Похоже, git-am выполняется. Перемещение невозможно." -#: git-rebase.sh:357 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "Нет перемещения в процессе?" -#: git-rebase.sh:368 +#: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." -#: git-rebase.sh:375 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "Не удалось прочитать HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:377 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add" -#: git-rebase.sh:396 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Не удалось перейти назад на $head_name" - -#: git-rebase.sh:415 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11630,97 +12122,97 @@ msgid "" "valuable there." msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное." -#: git-rebase.sh:466 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "недействительная вышестоящая ветка $upstream_name" -#: git-rebase.sh:490 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: имеется больше одной базы слияния" -#: git-rebase.sh:493 git-rebase.sh:497 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: нет базы слияния" -#: git-rebase.sh:502 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Не указывает на действительный коммит: $onto_name" -#: git-rebase.sh:525 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "критическая ошибка: нет такой ветки: $branch_name" -#: git-rebase.sh:558 +#: git-rebase.sh:557 msgid "Cannot autostash" msgstr "Не удалось выполнить автоматическое прятанье" -#: git-rebase.sh:563 +#: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Изменения автоматически спрятаны: $stash_abbrev" -#: git-rebase.sh:567 +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "Сделайте коммит или спрячьте их." -#: git-rebase.sh:587 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущая ветка $branch_name уже свежая." -#: git-rebase.sh:591 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение." -#: git-rebase.sh:602 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Изменения от $mb до $onto:" -#: git-rebase.sh:611 +#: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…" -#: git-rebase.sh:621 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Перемотана вперед $branch_name до $onto_name." -#: git-stash.sh:51 +#: git-stash.sh:50 msgid "git stash clear with parameters is unimplemented" msgstr "git stash очистка с параметрами не реализована" -#: git-stash.sh:74 +#: git-stash.sh:73 msgid "You do not have the initial commit yet" msgstr "У вас еще нет начального коммита" -#: git-stash.sh:89 +#: git-stash.sh:88 msgid "Cannot save the current index state" msgstr "Не удалось сохранить текущее состояние индекса" -#: git-stash.sh:124 git-stash.sh:137 +#: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Не удалось сохранить текущее состояние рабочего каталога" -#: git-stash.sh:141 +#: git-stash.sh:140 msgid "No changes selected" msgstr "Изменения не выбраны" -#: git-stash.sh:144 +#: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" msgstr "Не удалось удалить временный индекс (не должно случаться)" -#: git-stash.sh:157 +#: git-stash.sh:156 msgid "Cannot record working tree state" msgstr "Не удалось записать состояние рабочего каталога" -#: git-stash.sh:189 +#: git-stash.sh:188 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Не удалось обновить $ref_stash с помощью $w_commit" @@ -11734,115 +12226,124 @@ msgstr "Не удалось обновить $ref_stash с помощью $w_com #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:239 +#: git-stash.sh:238 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "ошибка: неизвестная опция для «stash save»: $option\n Для предоставления сообщения, используйте git stash save -- «$option»" -#: git-stash.sh:260 +#: git-stash.sh:259 msgid "No local changes to save" msgstr "Нет локальных изменений для сохранения" -#: git-stash.sh:264 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "Не удалось инициализировать спрятанные изменения" -#: git-stash.sh:268 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "Не удалось сохранить текущий статус" -#: git-stash.sh:286 +#: git-stash.sh:268 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg" + +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "Не удалось удалить изменения рабочего каталога" -#: git-stash.sh:405 +#: git-stash.sh:404 #, sh-format msgid "unknown option: $opt" msgstr "неизвестная опция: $opt" -#: git-stash.sh:415 +#: git-stash.sh:414 msgid "No stash found." msgstr "Не найдены спрятанные изменения." -#: git-stash.sh:422 +#: git-stash.sh:421 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Передано слишком много редакций: $REV" -#: git-stash.sh:428 +#: git-stash.sh:427 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference не является действительной ссылкой" -#: git-stash.sh:456 +#: git-stash.sh:455 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "«$args» не похоже на коммит со спрятанными изменениями" -#: git-stash.sh:467 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash reference" msgstr "«$args» не является ссылкой на спрятанные изменения" -#: git-stash.sh:475 +#: git-stash.sh:474 msgid "unable to refresh index" msgstr "не удалось обновить индекс" -#: git-stash.sh:479 +#: git-stash.sh:478 msgid "Cannot apply a stash in the middle of a merge" msgstr "Нельзя применить спрятанные изменения во время выполнения слияния" -#: git-stash.sh:487 +#: git-stash.sh:486 msgid "Conflicts in index. Try without --index." msgstr "Конфликты в индексе. Попробуйте без --index." -#: git-stash.sh:489 +#: git-stash.sh:488 msgid "Could not save index tree" msgstr "Не удалось сохранить дерево индекса" -#: git-stash.sh:523 +#: git-stash.sh:522 msgid "Cannot unstage modified files" msgstr "Невозможно убрать из индекса измененные файлы" -#: git-stash.sh:538 +#: git-stash.sh:537 msgid "Index was not unstashed." msgstr "Индекс не был извлечён из спрятанных изменений." -#: git-stash.sh:561 +#: git-stash.sh:551 +msgid "The stash is kept in case you need it again." +msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся." + +#: git-stash.sh:560 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Отброшено ${REV} ($s)" -#: git-stash.sh:562 +#: git-stash.sh:561 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений" -#: git-stash.sh:570 +#: git-stash.sh:569 msgid "No branch name specified" msgstr "Не указано имя ветки" -#: git-stash.sh:642 +#: git-stash.sh:641 msgid "(To restore them type \"git stash apply\")" msgstr "(Чтобы восстановить их, наберите «git stash apply»)" -#: git-submodule.sh:219 +#: git-submodule.sh:183 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога" -#: git-submodule.sh:229 +#: git-submodule.sh:193 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../" -#: git-submodule.sh:246 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "«$sm_path» уже содержится в индексе" -#: git-submodule.sh:250 +#: git-submodule.sh:214 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11850,212 +12351,212 @@ msgid "" "Use -f if you really want to add it." msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить." -#: git-submodule.sh:268 +#: git-submodule.sh:232 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс" -#: git-submodule.sh:270 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "«$sm_path» уже существует и не является действительным репозиторием git" -#: git-submodule.sh:278 +#: git-submodule.sh:242 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:" -#: git-submodule.sh:280 +#: git-submodule.sh:244 #, sh-format msgid "" -"If you want to reuse this local git directory instead of cloning again from" -msgstr "Если вы хотите переиспользовать локальный каталог git вместо повторного клонирования из" +"If you want to reuse this local git directory instead of cloning again from\n" +" $realrepo\n" +"use the '--force' option. If the local git directory is not the correct repo\n" +"or you are unsure what this means choose another name with the '--name' option." +msgstr "Если вы хотите повторно использовать локальный каталог git вместо повторного клонирования из\n $realrepo\nто используйте параметр «--force». Если же локальный каталог git не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»." -#: git-submodule.sh:282 -#, sh-format -msgid "" -"use the '--force' option. If the local git directory is not the correct repo" -msgstr ", то используйте опцию «--force». Если локальный каталог git не является действительным репозиторием" - -#: git-submodule.sh:283 -#, sh-format -msgid "" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "или если вы не поняли, что это значит, то просто используйте другое имя с помощью опции «--name»." - -#: git-submodule.sh:285 +#: git-submodule.sh:250 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Восстановление локального каталога git для подмодуля «$sm_name»." -#: git-submodule.sh:297 +#: git-submodule.sh:262 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»" -#: git-submodule.sh:302 +#: git-submodule.sh:267 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Сбой добавления подмодуля «$sm_path»" -#: git-submodule.sh:311 +#: git-submodule.sh:276 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Не удалось зарегистрировать подмодуль «$sm_path»" -#: git-submodule.sh:355 +#: git-submodule.sh:323 #, sh-format msgid "Entering '$displaypath'" msgstr "Заходим в «$displaypath»" -#: git-submodule.sh:375 +#: git-submodule.sh:343 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Останавливаемся на «$displaypath»; сценарий вернул не нулевой код возврата." -#: git-submodule.sh:448 +#: git-submodule.sh:414 #, sh-format msgid "pathspec and --all are incompatible" msgstr "спецификацию пути и --all нельзя использовать одновременно" -#: git-submodule.sh:453 +#: git-submodule.sh:419 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули" -#: git-submodule.sh:470 -#, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" -msgstr "Рабочий каталог подмодуля «$displaypath» содержит каталог .git" - -#: git-submodule.sh:471 +#: git-submodule.sh:439 #, 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 "(используйте «rm -rf», если вы действительно хотите удалить его, включая всю его историю)" +msgstr "Рабочий каталог подмодуля «$displaypath» уже содержит каталог .git\n(используйте «rm -rf», если вы действительно хотите удалить его со всей историей изменений)" -#: git-submodule.sh:477 +#: git-submodule.sh:447 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to" " discard them" msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их" -#: git-submodule.sh:480 +#: git-submodule.sh:450 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Очищен каталог «$displaypath»" -#: git-submodule.sh:481 +#: git-submodule.sh:451 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»" -#: git-submodule.sh:484 +#: git-submodule.sh:454 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»" -#: git-submodule.sh:493 +#: git-submodule.sh:463 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»" -#: git-submodule.sh:635 +#: git-submodule.sh:612 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" -#: git-submodule.sh:644 +#: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" -#: git-submodule.sh:667 +#: git-submodule.sh:627 +#, sh-format +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»" + +#: git-submodule.sh:645 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»" -#: git-submodule.sh:680 +#: git-submodule.sh:651 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита." + +#: git-submodule.sh:658 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:681 +#: git-submodule.sh:659 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" -#: git-submodule.sh:685 +#: git-submodule.sh:663 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:686 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" -#: git-submodule.sh:691 +#: git-submodule.sh:669 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:692 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" -#: git-submodule.sh:697 +#: git-submodule.sh:675 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:698 +#: git-submodule.sh:676 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»" -#: git-submodule.sh:729 +#: git-submodule.sh:707 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" -#: git-submodule.sh:837 +#: git-submodule.sh:815 msgid "The --cached option cannot be used with the --files option" msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" -#: git-submodule.sh:889 +#: git-submodule.sh:867 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неизвестный режим $mod_dst" -#: git-submodule.sh:909 +#: git-submodule.sh:887 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" -#: git-submodule.sh:912 +#: git-submodule.sh:890 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" -#: git-submodule.sh:915 +#: git-submodule.sh:893 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst" -#: git-submodule.sh:940 +#: git-submodule.sh:918 msgid "blob" msgstr "двоичный объект" -#: git-submodule.sh:1059 +#: git-submodule.sh:1040 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»" -#: git-submodule.sh:1123 +#: git-submodule.sh:1107 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Синхронизация url для подмодуля «$displaypath»" @@ -12064,3 +12565,385 @@ msgstr "Синхронизация url для подмодуля «$displaypath #, sh-format msgid "See git-${cmd}(1) for details." msgstr "Для дополнительной информации, смотрите git-${cmd}(1)." + +#: git-rebase--interactive.sh:131 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Перемещение ($new_count/$total)" + +#: git-rebase--interactive.sh:147 +msgid "" +"\n" +"Commands:\n" +" p, pick = use commit\n" +" r, reword = use commit, but edit the commit message\n" +" e, edit = use commit, but stop for amending\n" +" s, squash = use commit, but meld into previous commit\n" +" f, fixup = like \"squash\", but discard this commit's log message\n" +" x, exec = run command (the rest of the line) using shell\n" +" d, drop = remove commit\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "\nКоманды:\n p, pick = использовать коммит\n r, reword = использовать коммит, но изменить сообщение коммита\n e, edit = использовать коммит, но остановиться для внесения правок\n s, squash = использовать коммит, но объединить его с предыдущим коммитом\n f, fixup = как «squash», но отбросить сообщение этого коммита\n x, exec = выполнить команду (остаток строки) с помощью командной оболочки\n d, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n" + +#: git-rebase--interactive.sh:162 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n" + +#: git-rebase--interactive.sh:166 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n" + +#: git-rebase--interactive.sh:202 +#, sh-format +msgid "" +"You can amend the commit now, with\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +"\tgit rebase --continue" +msgstr "Теперь вы можете исправить коммит с помощью\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nКак только вы будете довольны результатом, запустите\n\n\tgit rebase --continue" + +#: git-rebase--interactive.sh:227 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1: не является коммитом, который можно взять" + +#: git-rebase--interactive.sh:266 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "Недопустимое имя коммита: $sha1" + +#: git-rebase--interactive.sh:308 +msgid "Cannot write current commit's replacement sha1" +msgstr "Не удалось записать замену sha1 текущего коммита" + +#: git-rebase--interactive.sh:360 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "Перемотка вперед до $sha1" + +#: git-rebase--interactive.sh:362 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "Не удалось перемотать вперед до $sha1" + +#: git-rebase--interactive.sh:371 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "Не удалось переместить HEAD на $first_parent" + +#: git-rebase--interactive.sh:376 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "Нельзя уплотнить слияние: $sha1" + +#: git-rebase--interactive.sh:390 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "Ошибка при повторении слияния $sha1" + +#: git-rebase--interactive.sh:398 +#, sh-format +msgid "Could not pick $sha1" +msgstr "Не удалось взять $sha1" + +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "Это сообщение коммита номер #${n}:" + +#: git-rebase--interactive.sh:412 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "Сообщение коммита номер #${n} будет пропущено:" + +#: git-rebase--interactive.sh:423 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "Это объединение $count коммита" +msgstr[1] "Это объединение $count коммитов" +msgstr[2] "Это объединение $count коммитов" +msgstr[3] "Это объединение $count коммитов" + +#: git-rebase--interactive.sh:431 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "Не удалось записать $fixup_msg" + +#: git-rebase--interactive.sh:434 +msgid "This is a combination of 2 commits." +msgstr "Это объединение 2 коммитов" + +#: git-rebase--interactive.sh:435 +msgid "This is the 1st commit message:" +msgstr "Это 1-е сообщение коммита:" + +#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 +#: git-rebase--interactive.sh:521 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "Не удалось применить $sha1… $rest" + +#: git-rebase--interactive.sh:549 +#, sh-format +msgid "" +"Could not amend commit after successfully picking $sha1... $rest\n" +"This is most likely due to an empty commit message, or the pre-commit hook\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue before\n" +"you are able to reword the commit." +msgstr "Не удолось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова." + +#: git-rebase--interactive.sh:564 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "Остановлено на $sha1_abbrev… $rest" + +#: git-rebase--interactive.sh:579 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита" + +#: git-rebase--interactive.sh:621 +#, sh-format +msgid "Executing: $rest" +msgstr "Выполнение: $rest" + +#: git-rebase--interactive.sh:629 +#, sh-format +msgid "Execution failed: $rest" +msgstr "Не удалось выполнить: $rest" + +#: git-rebase--interactive.sh:631 +msgid "and made changes to the index and/or the working tree" +msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге" + +#: git-rebase--interactive.sh:633 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue" + +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:646 +#, sh-format +msgid "" +"Execution succeeded: $rest\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue" + +#: git-rebase--interactive.sh:657 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "Неопознанная команда: $command $sha1 $rest" + +#: git-rebase--interactive.sh:658 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»." + +#: git-rebase--interactive.sh:693 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "Успешно перебазирован и обновлён $head_name." + +#: git-rebase--interactive.sh:740 +msgid "Could not skip unnecessary pick commands" +msgstr "Не удалось пропустить ненужные команды отбора (pick)" + +#: git-rebase--interactive.sh:898 +#, sh-format +msgid "" +"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +" - $line" +msgstr "Внимание: не найден SHA-1 или он не указывает на коммит. На строке:\n - $line" + +#: git-rebase--interactive.sh:931 +#, sh-format +msgid "" +"Warning: the command isn't recognized in the following line:\n" +" - $line" +msgstr "Внимание: команда не распознана на строке:\n - $line" + +#: git-rebase--interactive.sh:970 +msgid "could not detach HEAD" +msgstr "не удалось отделить HEAD" + +#: git-rebase--interactive.sh:1008 +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):" +msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):" + +#: git-rebase--interactive.sh:1016 +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" +"The possible behaviours are: ignore, warn, error." +msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error." + +#: git-rebase--interactive.sh:1027 +#, sh-format +msgid "" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." +msgstr "Нераспознанная настройка $check_level для опции rebase.missingCommitsCheck. Игнорирую." + +#: git-rebase--interactive.sh:1044 +msgid "You can fix this with 'git rebase --edit-todo'." +msgstr "Вы можете исправить это с помощью «git rebase --edit-todo»." + +#: git-rebase--interactive.sh:1045 +msgid "Or you can abort the rebase with 'git rebase --abort'." +msgstr "Или вы можете отменить процесс перебазирования с помощью «git rebase --abort»." + +#: git-rebase--interactive.sh:1069 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "Не удалось удалить CHERRY_PICK_HEAD" + +#: git-rebase--interactive.sh:1074 +#, sh-format +msgid "" +"You have staged changes in your working tree.\n" +"If these changes are meant to be\n" +"squashed into the previous commit, run:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"In both case, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "У вас имеются проиндексированные изменения в рабочем каталоге.\nЕсли эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend $gpg_sign_opt_quoted\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit $gpg_sign_opt_quoted\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" + +#: git-rebase--interactive.sh:1091 +msgid "Error trying to find the author identity to amend commit" +msgstr "Произошла ошибка при поиске автора для исправления коммита" + +#: git-rebase--interactive.sh:1096 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." + +#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 +msgid "Could not commit staged changes." +msgstr "Не удалось закоммитить проиндексированные изменения." + +#: git-rebase--interactive.sh:1129 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n" + +#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298 +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 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "Не удалось перейти на версию $switch_to" + +#: git-rebase--interactive.sh:1158 +msgid "No HEAD?" +msgstr "Нет указателя HEAD?" + +#: git-rebase--interactive.sh:1159 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Не удалось создать временный каталог $state_dir" + +#: git-rebase--interactive.sh:1161 +msgid "Could not mark as interactive" +msgstr "Не удалось пометить как интерактивный" + +#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176 +msgid "Could not init rewritten commits" +msgstr "Не удалось инициализировать перезаписанные коммиты" + +#: git-rebase--interactive.sh:1276 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)" +msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)" +msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)" +msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)" + +#: git-rebase--interactive.sh:1281 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n" + +#: git-rebase--interactive.sh:1288 +msgid "Note that empty commits are commented out" +msgstr "Заметьте, что пустые коммиты закомментированны" + +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "использование: $dashless $USAGE" + +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "Не удалось выполнить chdir в $cdup, вершину рабочего каталога" + +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "критическая ошибка: $program_name нельзя использовать не имея рабочего каталога." + +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "Не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения." + +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "Не удалось выполнить перезапись веток: У вас есть непроиндексированные изменения." + +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "Не удалось выполнить $action: У вас есть непроиндексированные изменения." + +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "Не удалось выполнить перемещение коммитов: В вашем индексе есть незакоммиченные изменения." + +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "Не удалось выполнить $action: В вашем индексе есть незакоммиченные изменения." + +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "Вам нужно запускать эту команду находясь на вершине рабочего каталога." + +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "Не удалось определить абсолютный путь к каталогу git" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.10.0\n" +"Project-Id-Version: git 2.11.0\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-27 20:41+0100\n" +"POT-Creation-Date: 2016-11-22 22:10+0800\n" +"PO-Revision-Date: 2016-11-22 22:16+0800\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -111,6 +111,622 @@ msgstr "" " git checkout -b <namn-på-ny-gren>\n" "\n" +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "okänt alternativ för whitespace: \"%s\"" + +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "okänt alternativ för ignore-whitespace: \"%s\"" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject och --3way kan inte användas samtidigt" + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached och --3way kan inte användas samtidigt" + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way utanför arkiv" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index utanför arkiv" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached utanför arkiv" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec returnerade %d för indata: %s" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "kan inte hitta filnamn i patchen på rad %d" + +#: apply.c:977 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" + +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" + +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" + +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" + +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: förväntade rad: %.*s" + +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "patch-fragment utan huvud på rad %d: %.*s" + +#: apply.c:1577 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n" +"tas bort (rad %d)" +msgstr[1] "" +"git-diff-huvudet saknar filnamnsinformation när %d ledande " +"sökvägskomponenter\n" +"tas bort (rad %d)" + +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" + +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "ny fil beror på gammalt innehåll" + +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "borttagen fil har fortfarande innehåll" + +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "trasig patch på rad %d" + +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "nya filen %s beror på gammalt innehåll" + +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "borttagna filen %s har fortfarande innehåll" + +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** varning: filen %s blir tom men har inte tagits bort" + +#: apply.c:1984 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "trasig binärpatch på rad %d: %.*s" + +#: apply.c:2021 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "binärpatchen på rad %d känns inte igen" + +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "patch med bara skräp på rad %d" + +#: apply.c:2274 +#, c-format +msgid "unable to read symlink %s" +msgstr "kunde inte läsa symboliska länken %s" + +#: apply.c:2278 +#, c-format +msgid "unable to open or read %s" +msgstr "kunde inte öppna eller läsa %s" + +#: apply.c:2931 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "felaktig inledning på rad: \"%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] "Stycke %d lyckades på %d (offset %d rad)." +msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." + +#: apply.c:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" + +#: apply.c:3068 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"vid sökning efter:\n" +"%.*s" + +#: apply.c:3090 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "saknar binära patchdata för \"%s\"" + +#: apply.c:3098 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" +"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" +"\"" + +#: apply.c:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "" +"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" + +#: apply.c:3154 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " +"innehållet." + +#: apply.c:3162 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" + +#: apply.c:3180 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" + +#: apply.c:3193 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "binärpatchen kan inte tillämpas på \"%s\"" + +#: apply.c:3199 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" + +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "patch misslyckades: %s:%ld" + +#: apply.c:3342 +#, c-format +msgid "cannot checkout %s" +msgstr "kan inte checka ut %s" + +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#, c-format +msgid "failed to read %s" +msgstr "misslyckades läsa %s" + +#: apply.c:3398 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" + +#: apply.c:3427 apply.c:3667 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "sökvägen %s har ändrat namn/tagits bort" + +#: apply.c:3510 apply.c:3681 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: finns inte i indexet" + +#: apply.c:3519 apply.c:3689 +#, c-format +msgid "%s: does not match index" +msgstr "%s: motsvarar inte indexet" + +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "" +"arkivet saknar objekt som behövs för att falla tillbaka på 3-" +"vägssammanslagning." + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "Faller tillbaka på trevägssammanslagning...\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Applicerade patchen på \"%s\" med konflikter.\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Tillämpade patchen på \"%s\" rent.\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "patch för borttagning lämnar kvar filinnehåll" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "%s: fel typ" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s har typen %o, förväntade %o" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "ogiltig sökväg: %s" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: finns redan i indexet" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: finns redan i arbetskatalogen" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" + +#: apply.c:3945 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" + +#: apply.c:3965 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" + +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: patchen kan inte tillämpas" + +#: apply.c:3984 +#, c-format +msgid "Checking patch %s..." +msgstr "Kontrollerar patchen %s..." + +#: apply.c:4075 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" + +#: apply.c:4082 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" + +#: apply.c:4085 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "sha1-informationen saknas eller är oanvändbar (%s)." + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "kunde inte lägga till %s till temporärt index" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "kunde inte skriva temporärt index till %s" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "kan inte ta bort %s från indexet" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "trasig patch för undermodulen %s" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "kan inte ta status på nyligen skapade filen \"%s\"" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "kan inte lägga till cachepost för %s" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "misslyckades skriva till \"%s\"" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "stänger filen \"%s\"" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "kan inte skriva filen \"%s\" läge %o" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Tillämpade patchen %s rent." + +#: apply.c:4518 +msgid "internal error" +msgstr "internt fel" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Tillämpade patchen %%s med %d refuserad..." +msgstr[1] "Tillämpade patchen %%s med %d refuserade..." + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "trunkerar .rej-filnamnet till %.*s.rej" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "kan inte öppna %s" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Stycke %d tillämpades rent." + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Refuserar stycke %d." + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Ignorerar patch \"%s\"." + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "indata känns inte igen" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "kan inte läsa indexfilen" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "kan inte öppna patchen \"%s\": %s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "undertryckte %d fel i blanksteg" +msgstr[1] "undertryckte %d fel i blanksteg" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d rad lägger till fel i blanksteg." +msgstr[1] "%d rader lägger till fel i blanksteg." + +#: apply.c:4872 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." +msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." + +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "Kunde inte skriva ny indexfil" + +#: 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 "sökväg" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "tillämpa inte ändringar som motsvarar given sökväg" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "tillämpa ändringar som motsvarar given sökväg" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "antal" + +#: apply.c:4926 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "ignorera tillägg gjorda av patchen" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "visa antal tillagda och borttagna rader decimalt" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "se till att patchen kan tillämpas på aktuellt index" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "tillämpa en patch utan att röra arbetskatalogen" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "godta en patch som rör filer utanför arbetskatalogen" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "sökvägar avdelas med NUL-tecken" + +#: apply.c:4956 +msgid "ensure at least <n> lines of context match" +msgstr "se till att åtminstone <n> rader sammanhang är lika" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "åtgärd" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "detektera nya eller ändrade rader som har fel i blanktecken" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "ignorera ändringar i blanktecken för sammanhang" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "tillämpa patchen baklänges" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "förvänta inte minst en rad sammanhang" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "lämna refuserade stycken i motsvarande *.rej-filer" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "tillåt överlappande stycken" + +#: 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 "var pratsam" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "lite inte på antalet linjer i styckehuvuden" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "rot" + +#: apply.c:4982 +msgid "prepend <root> to all filenames" +msgstr "lägg till <rot> i alla filnamn" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" @@ -130,7 +746,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --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ökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -143,7 +759,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:430 builtin/log.c:1422 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "prefix" @@ -151,11 +767,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: 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 "fil" @@ -187,8 +803,8 @@ msgstr "komprimera bättre" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: 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 "arkiv" @@ -196,7 +812,7 @@ msgstr "arkiv" msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: 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 "kommando" @@ -471,27 +1087,27 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:266 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:286 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:291 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:345 +#: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:364 +#: branch.c:363 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -506,7 +1122,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %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 "kunde inte öppna \"%s\"" @@ -515,9 +1131,9 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: 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 "misslyckades skapa revisionstraversering" @@ -557,7 +1173,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till 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 "okänt argument: %s" @@ -580,8 +1196,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*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 "kunde inte tolka %s" @@ -591,6 +1207,16 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" +#: 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 "" +"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n" +"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n" +"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "minnet slut" @@ -680,7 +1306,7 @@ msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:849 config.c:860 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" @@ -723,24 +1349,68 @@ msgstr "kunde inte ställa in \"%s\" till \"%s\"" msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "Fjärren lade på vid inledande kontakt" + +#: 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 "" +"Kunde inte läsa från fjärrarkiv.\n" +"\n" +"Se till att du har korrekt åtkomstbehörighet\n" +"och att arkivet existerar." + # Vague original, not networking-related, but rather related to the actual # objects in the database. #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:74 +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:94 +#: connected.c:95 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:101 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" +#: convert.c:201 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"CRLF kommer att ersättas av LF i %s.\n" +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog." + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "CRLF skulle ersättas av LF i %s." + +#: convert.c:211 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"LF kommer att ersättas av CRLF i %s.\n" +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog." + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "LF skulle ersättas av CRLF i %s." + #: date.c:97 msgid "in the future" msgstr "i framtiden" @@ -814,26 +1484,31 @@ msgstr[1] "%lu år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:540 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:116 +#: diff.c:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "flaggan \"%s\" behöver ett värde" + +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:121 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:225 +#: diff.c:283 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:277 +#: diff.c:346 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -842,16 +1517,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3017 +#: diff.c:3087 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3415 +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" + +#: diff.c:3502 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3578 +#: diff.c:3665 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -860,61 +1539,244 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3592 +#: diff.c:3679 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: dir.c:1823 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "" +"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer" + +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." +msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." + +#: diff.c:4706 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." + +#: dir.c:1866 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:1942 +#: dir.c:1985 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: gpg-interface.c:178 +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: förväntade grund lista" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF" + +#: fetch-pack.c:243 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" + +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc kräver \"multi ack detailed\"" + +#: fetch-pack.c:381 +#, c-format +msgid "invalid shallow line: %s" +msgstr "ogiltig \"shallow\"-rad: %s" + +#: fetch-pack.c:387 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "ogiltig \"unshallow\"-rad: %s" + +#: fetch-pack.c:389 +#, c-format +msgid "object not found: %s" +msgstr "objektet hittades inte: %s" + +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" +msgstr "fel i objekt: %s" + +#: fetch-pack.c:394 +#, c-format +msgid "no shallow found: %s" +msgstr "ingen \"shallow\" hittades: %s" + +#: fetch-pack.c:397 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "förväntade shallow/unshallow, fick %s" + +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" +msgstr "fick %s %d %s" + +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "ogiltig incheckning %s" + +#: fetch-pack.c:483 +msgid "giving up" +msgstr "ger upp" + +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "klart" + +#: fetch-pack.c:505 +#, c-format +msgid "got %s (%d) %s" +msgstr "fick %s (%d) %s" + +#: fetch-pack.c:551 +#, c-format +msgid "Marking %s as complete" +msgstr "Markerar %s som komplett" + +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" +msgstr "har redan %s (%s)" + +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "protokollfel: felaktigt packhuvud" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-patch: kunde inte grena av %s" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "%s misslyckades" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "fel i sidbands-avmultiplexare" + +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "Servern stöder inte klienter med grunda arkiv" + +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "Servern stöder \"multi_ack_detailed\"" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "Servern stöder \"no-done\"" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "Servern stöder \"multi_ack\"" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "Servern stöder \"side-band-64k\"" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "Servern stöder \"side-band\"" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "Servern stöder \"allow-tip-sha1-in-want\"" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "Servern stöder \"ofs-delta\"" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "Serverversionen är %.*s" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "Servern stöder inte --shallow-since" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "Servern stöder inte --shallow-exclude" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "Servern stöder inte --deepen" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "inga gemensamma incheckningar" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-patch: hämtning misslyckades." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "inget motsvarande fjärrhuvud" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:208 +#: gpg-interface.c:215 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:210 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: grep.c:1792 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1820 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:309 +#: help.c:306 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -923,11 +1785,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -936,17 +1798,17 @@ msgstr "" "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" "Fortsätter under förutsättningen att du menade \"%s\"" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:404 help.c:470 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -960,11 +1822,37 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: 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" +"*** Vänligen berätta vem du är.\n" +"\n" +"Kör\n" +"\n" +" git config --global user.email \"du@example.com\"\n" +" git config --global user.name \"Ditt Namn\"\n" +"\n" +"för att ställa in ditt kontos standardidentitet.\n" +"Kör utan --global för att endast ändra i aktuellt arkiv.\n" +"\n" + #: lockfile.c:152 #, c-format msgid "" @@ -994,8 +1882,8 @@ msgstr "kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: 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 "kunde inte skriva ny indexfil" @@ -1031,7 +1919,7 @@ msgstr ": kanske en K/F-konflikt?" msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:796 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" @@ -1171,7 +2059,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1736 git-submodule.sh:919 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "undermodul" @@ -1237,6 +2125,23 @@ msgstr "Kunde inte tolka objektet \"%s\"" msgid "Unable to write index." msgstr "Kunde inte skriva indexet." +#: 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 "" +"Du har inte avslutat föregående antecknings-sammanslagning (%s finns).\n" +"Använd \"git notes merge --commit\" eller \"git notes merge --abort\" för " +"att checka in eller avbryta föregående sammanslagning innan du påbörjar en " +"ny antecknings-sammanslagning." + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)." + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" @@ -1293,7 +2198,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:798 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -1350,12 +2255,20 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %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 "" +"tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " +"utgåva. använd istället . om du vill träffa alla sökvägar" + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1363,15 +2276,11 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" -#: pretty.c:973 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: progress.c:235 -msgid "done" -msgstr "klart" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1380,7 +2289,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1389,22 +2298,22 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder 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 "Kunde inte öppna \"%s\" för skrivning" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:2537 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:2546 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" @@ -1533,12 +2442,12 @@ msgstr "ignorerar referens med trasigt namn %s" msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" @@ -1662,37 +2571,37 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: revision.c:2132 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2135 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2329 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: send-pack.c:298 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:411 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:413 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -1700,15 +2609,23 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:425 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:430 +#: send-pack.c:429 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: 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>'" @@ -1716,7 +2633,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: 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" @@ -1726,229 +2643,256 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"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 "Kunde inte skriva till %s" +msgid "could not lock '%s'" +msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, c-format -msgid "Error wrapping up %s." -msgstr "Fel vid ombrytning av %s." +msgid "could not write to '%s'" +msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s" +msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:228 +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "dina lokala ändringar skulle skrivas över av %s." + +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#: sequencer.c:324 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" #. 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: Kunde inte skriva ny indexfil" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" -msgstr "Kunde inte bestämma HEAD:s incheckning\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" +msgstr "kunde inte bestämma HEAD:s incheckning\n" + +#: sequencer.c:438 +msgid "unable to update cache tree\n" +msgstr "kan inte uppdatera cacheträd\n" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" -msgstr "Kan inte uppdatera cacheträd\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 "" +"du har köade ändringar i din arbetskatalog.\n" +"Om ändringarna skall läggas in i föregående incheckning, kör:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Om de skall checkas in i en egen incheckning, kör:\n" +"\n" +" git commit %s\n" +"\n" +"Oavsett vilket, när du är färdig fortsätter du med:\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:393 +#: sequencer.c:567 #, c-format -msgid "Could not parse commit %s\n" -msgstr "Kunde inte tolka incheckningen %s\n" +msgid "could not parse commit %s\n" +msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:398 +#: sequencer.c:572 #, c-format -msgid "Could not parse parent commit %s\n" -msgstr "Kunde inte tolka föräldraincheckningen %s\n" +msgid "could not parse parent commit %s\n" +msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:463 -msgid "Your index file is unmerged." -msgstr "Din indexfil har inte slagits ihop." +#: sequencer.c:656 +msgid "your index file is unmerged." +msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:482 +#: sequencer.c:675 #, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." +msgid "commit %s is a merge but no -m option was given." +msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:490 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Incheckning %s har inte förälder %d" +msgid "commit %s does not have parent %d" +msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:494 +#: sequencer.c:687 #, c-format -msgid "Mainline was specified but commit %s is not a merge." -msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" +msgid "mainline was specified but commit %s is not a merge." +msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning" -#. 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: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:511 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" -msgstr "Kan inte hämta incheckningsmeddelande för %s" +msgid "cannot get commit message for %s" +msgstr "kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:597 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:598 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:633 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:641 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:645 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:705 -msgid "Cannot revert during another revert." -msgstr "Kan inte utföra \"revert\" under en annan \"revert\"." - -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "Kan inte utföra \"revert\" under en \"cherry-pick\"." - -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "Kan inte utföra \"cherry-pick\" under en \"revert\"." - -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"." - -#: sequencer.c:732 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "Kan inte tolka rad %d." +msgid "invalid line %d: %.*s" +msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:737 -msgid "No commits parsed." -msgstr "Inga incheckningar lästes." +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "inga incheckningar lästes." -#: sequencer.c:749 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "Kunde inte öppna %s" +msgid "could not read '%s'." +msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:753 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "kunde inte läsa %s." +msgid "unusable instruction sheet: '%s'" +msgstr "oanvändbart manus: %s" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "Oanvändbart manus: %s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." + +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:790 +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" -msgstr "Felaktig nyckel: %s" +msgid "invalid key: %s" +msgstr "felaktig nyckel: %s" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "Felaktigt värde för %s: %s" +msgid "invalid value for %s: %s" +msgstr "felaktigt värde för %s: %s" -#: sequencer.c:803 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "Trasigt manus: %s" +msgid "malformed options sheet: '%s'" +msgstr "trasigt manus: %s" -#: sequencer.c:822 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:823 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" +msgid "could not create sequencer directory '%s'" +msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" + +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "kunde inte låsa HEAD" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:864 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:866 sequencer.c:900 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 +#: sequencer.c:1175 builtin/grep.c:578 #, c-format -msgid "cannot open %s" -msgstr "kan inte öppna %s" +msgid "cannot open '%s'" +msgstr "kan inte öppna \"%s\"" -#: sequencer.c:888 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "kan inte läsa %s: %s" +msgid "cannot read '%s': %s" +msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:889 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:895 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "Kunde inte formatera %s." - -#: sequencer.c:1066 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1069 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "Kan inte ångra som första incheckning" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "kan inte ångra som första incheckning" #: setup.c:160 #, c-format @@ -1983,11 +2927,6 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "misslyckades läsa %s" - #: setup.c:468 #, c-format msgid "Expected git repo version <= %d, found %d" @@ -2034,21 +2973,55 @@ msgstr "" "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: sha1_file.c:1046 +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "sökvägen \"%s\" finns inte" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "referensarkivet \"%s\" är grunt" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "referensarkivet \"%s\" är ympat" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2434 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: sha1_file.c:2438 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "kort SHA1 %s är tvetydig" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "Kandidaterna är:" + +#: 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" @@ -2095,7 +3068,7 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" @@ -2104,59 +3077,59 @@ msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra \"trailer\"-kommandot \"%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 "okänt värde \"%s\" för nyckeln \"%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 "mer än en %s" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "Kunde inte läsa från standard in" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "kunde inte öppna temporär file" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" -msgstr "kunde inte byta nman på temporära file till %s" +msgstr "kunde inte byta namn på temporär fil till %s" #: transport.c:62 #, c-format @@ -2168,7 +3141,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: %s" -#: transport.c:771 +#: transport.c:817 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -2177,7 +3150,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:775 +#: transport.c:821 #, c-format msgid "" "\n" @@ -2204,15 +3177,31 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:783 +#: transport.c:829 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1041 +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "Kunde inte läsa referensen %s" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "trädobjekt för kort" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "felformat läge i trädpost" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "tomt filnamn i trädpost" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "trädfil för kort" + #: unpack-trees.c:64 #, c-format msgid "" @@ -2412,7 +3401,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 "" @@ -2423,7 +3412,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 "" @@ -2479,14 +3468,14 @@ msgstr "misslyckades läsa \"%s\"" msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: 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 "kunde inte öppna \"%s\" för skrivning" -#: 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 "kunde inte öppna \"%s\" för läsning" @@ -2510,148 +3499,148 @@ msgstr "kunde inte skriva till %s" msgid "could not close %s" msgstr "kunde inte stänga %s" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: 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 " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: 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 " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: 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 " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 wt-status.c:882 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 wt-status.c:891 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:756 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:758 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:839 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2659,103 +3648,103 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:950 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:953 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:955 +#: wt-status.c:1018 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:960 +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:963 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:973 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:976 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:980 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:982 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:984 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1109 +#: wt-status.c:1172 msgid "No commands done." msgstr "Inga kommandon utförda." -#: 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] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1123 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1128 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: 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] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1139 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1152 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1157 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1171 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1173 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1175 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1181 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"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'." @@ -2763,122 +3752,122 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1190 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1193 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1197 +#: wt-status.c:1260 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1202 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1205 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1207 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1217 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1222 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1225 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"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 "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1236 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1241 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1244 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1246 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1257 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1261 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1264 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1464 +#: wt-status.c:1524 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1470 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1472 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1477 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1479 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1482 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1500 +#: wt-status.c:1560 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1514 +#: wt-status.c:1574 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1516 +#: wt-status.c:1576 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1520 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2890,32 +3879,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1526 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1528 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1534 +#: wt-status.c:1594 msgid "No changes" msgstr "Inga ändringar" -#: 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 "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1542 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1545 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2924,52 +3913,67 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1548 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1551 +#: wt-status.c:1611 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1554 wt-status.c:1559 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1557 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1561 +#: wt-status.c:1621 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1668 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1672 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1701 +#: wt-status.c:1761 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1703 wt-status.c:1711 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "efter " -#: wt-status.c:1706 wt-status.c:1709 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "före " -#: 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 "kan inte %s: Du har oköade ändringar." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "dessutom innehåller dit index ändringar som inte har checkats in." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -2978,273 +3982,258 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:71 builtin/commit.c:281 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:81 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:136 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: 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 "Kunde inte läsa indexet" -#: builtin/add.c:207 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:211 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:214 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:217 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:219 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:224 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:234 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c: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 "testkörning" -#: 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 "var pratsam" - -#: builtin/add.c:256 +#: builtin/add.c:269 msgid "interactive picking" msgstr "plocka interaktivt" -#: 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 "välj stycken interaktivt" -#: builtin/add.c:258 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:259 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:260 +#: builtin/add.c:273 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:261 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:262 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:265 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:267 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:268 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:269 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: 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 "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:292 +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:300 +#: builtin/add.c:312 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:336 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:343 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:352 +#: builtin/add.c:359 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:367 +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:368 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"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 "indexfilen trasig" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "Kunde inte skriva ny indexfil" - -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "kunde inte läsa \"%s\"" - -#: builtin/am.c:426 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:503 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:544 builtin/notes.c:301 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%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 "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:607 +#: builtin/am.c:595 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:787 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:852 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:899 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:902 builtin/am.c:910 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:907 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:996 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: 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 "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1005 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1137 builtin/commit.c:366 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1188 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1177 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1190 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1402 builtin/log.c:1543 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1602 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1604 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: 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." @@ -3252,39 +4241,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1629 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1654 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: 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 misslyckades skriva ett träd" -#: builtin/am.c:1686 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: 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 "kunde inte skriva incheckningsobjekt" -#: 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 "kan inte återuppta: %s finns inte." -#: builtin/am.c:1751 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1756 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -3292,35 +4281,35 @@ msgstr "Incheckningskroppen är:" #. 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 "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1816 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1853 builtin/am.c:1925 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1869 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1877 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %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 "En kopia av patchen som misslyckades finns i: %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" @@ -3330,7 +4319,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1935 +#: builtin/am.c:1943 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -3338,17 +4327,17 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n" "Glömde du använda \"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 "Kan inte tolka objektet \"%s\"" -#: builtin/am.c:2095 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: 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" @@ -3356,154 +4345,133 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2192 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2225 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2226 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2232 +#: builtin/am.c:2240 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2234 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2236 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: 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 "var tyst" -#: builtin/am.c:2239 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2242 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2244 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2246 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2248 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2250 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2253 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2256 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "åtgärd" - -#: 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 "sänd det genom git-apply" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "rot" - -#: 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 "sökväg" - -#: 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 "antal" - -#: 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 för patch(ar)" -#: builtin/am.c:2288 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2290 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2293 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2296 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2299 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2303 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2305 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: 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 "nyckel-id" -#: builtin/am.c:2308 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2311 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(används internt av 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." @@ -3511,16 +4479,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2333 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2348 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2372 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3529,488 +4497,14 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2378 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/apply.c:122 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<flaggor>] [<patch>...]" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "okänt alternativ för whitespace: \"%s\"" - -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "okänt alternativ för ignore-whitespace: \"%s\"" - -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" - -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec returnerade %d för indata: %s" - -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "kan inte hitta filnamn i patchen på rad %d" - -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" - -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" - -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" - -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" - -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: förväntade rad: %.*s" - -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "patch-fragment utan huvud på rad %d: %.*s" - -#: builtin/apply.c:1567 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n" -"tas bort (rad %d)" -msgstr[1] "" -"git-diff-huvudet saknar filnamnsinformation när %d ledande " -"sökvägskomponenter\n" -"tas bort (rad %d)" - -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "ny fil beror på gammalt innehåll" - -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "borttagen fil har fortfarande innehåll" - -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" -msgstr "trasig patch på rad %d" - -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "nya filen %s beror på gammalt innehåll" - -#: builtin/apply.c:1812 -#, c-format -msgid "deleted file %s still has contents" -msgstr "borttagna filen %s har fortfarande innehåll" - -#: builtin/apply.c:1815 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** varning: filen %s blir tom men har inte tagits bort" - -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "trasig binärpatch på rad %d: %.*s" - -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "binärpatchen på rad %d känns inte igen" - -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "patch med bara skräp på rad %d" - -#: builtin/apply.c:2244 -#, c-format -msgid "unable to read symlink %s" -msgstr "kunde inte läsa symboliska länken %s" - -#: builtin/apply.c:2248 -#, c-format -msgid "unable to open or read %s" -msgstr "kunde inte öppna eller läsa %s" - -#: builtin/apply.c:2901 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "felaktig inledning på rad: \"%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] "Stycke %d lyckades på %d (offset %d rad)." -msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." - -#: builtin/apply.c:3032 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" - -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"vid sökning efter:\n" -"%.*s" - -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "saknar binära patchdata för \"%s\"" - -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "binärpatchen kan inte tillämpas på \"%s\"" - -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" - -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "patch misslyckades: %s:%ld" - -#: builtin/apply.c:3314 -#, c-format -msgid "cannot checkout %s" -msgstr "kan inte checka ut %s" - -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" - -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "sökvägen %s har ändrat namn/tagits bort" - -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: finns inte i indexet" - -#: 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: motsvarar inte indexet" - -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "patch för borttagning lämnar kvar filinnehåll" - -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s: fel typ" - -#: builtin/apply.c:3671 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s har typen %o, förväntade %o" - -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" -msgstr "ogiltig sökväg: %s" - -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: finns redan i indexet" - -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: finns redan i arbetskatalogen" - -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" - -#: builtin/apply.c:3907 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" - -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" - -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: patchen kan inte tillämpas" - -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "Kontrollerar patchen %s..." - -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" - -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "kan inte ta bort %s från indexet" - -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "trasig patch för undermodulen %s" - -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "kan inte ta status på nyligen skapade filen \"%s\"" - -#: builtin/apply.c:4224 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" - -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "kan inte lägga till cachepost för %s" - -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "stänger filen \"%s\"" - -#: builtin/apply.c:4313 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "kan inte skriva filen \"%s\" läge %o" - -#: builtin/apply.c:4403 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "Tillämpade patchen %s rent." - -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "internt fel" - -#: builtin/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "Tillämpade patchen %%s med %d refuserad..." -msgstr[1] "Tillämpade patchen %%s med %d refuserade..." - -#: builtin/apply.c:4424 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "trunkerar .rej-filnamnet till %.*s.rej" - -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "kan inte öppna %s: %s" - -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "Stycke %d tillämpades rent." - -#: builtin/apply.c:4448 -#, c-format -msgid "Rejected hunk #%d." -msgstr "Refuserar stycke %d." - -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." -msgstr "Ignorerar patch \"%s\"." - -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "indata känns inte igen" - -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "kan inte läsa indexfilen" - -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "--3way utanför arkiv" - -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "--index utanför arkiv" - -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "--cached utanför arkiv" - -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "kan inte öppna patchen \"%s\"" - -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "undertryckte %d fel i blanksteg" -msgstr[1] "undertryckte %d fel i blanksteg" - -#: 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 rad lägger till fel i blanksteg." -msgstr[1] "%d rader lägger till fel i blanksteg." - -#: builtin/apply.c:4800 -msgid "don't apply changes matching the given path" -msgstr "tillämpa inte ändringar som motsvarar given sökväg" - -#: builtin/apply.c:4803 -msgid "apply changes matching the given path" -msgstr "tillämpa ändringar som motsvarar given sökväg" - -#: builtin/apply.c:4806 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" - -#: builtin/apply.c:4809 -msgid "ignore additions made by the patch" -msgstr "ignorera tillägg gjorda av patchen" - -#: builtin/apply.c:4811 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" - -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "visa antal tillagda och borttagna rader decimalt" - -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" - -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" - -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "se till att patchen kan tillämpas på aktuellt index" - -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "tillämpa en patch utan att röra arbetskatalogen" - -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "godta en patch som rör filer utanför arbetskatalogen" - -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" - -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" - -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" -msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" - -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" -msgstr "sökvägar avdelas med NUL-tecken" - -#: builtin/apply.c:4836 -msgid "ensure at least <n> lines of context match" -msgstr "se till att åtminstone <n> rader sammanhang är lika" - -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "detektera nya eller ändrade rader som har fel i blanktecken" - -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "ignorera ändringar i blanktecken för sammanhang" - -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "tillämpa patchen baklänges" - -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "förvänta inte minst en rad sammanhang" - -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "lämna refuserade stycken i motsvarande *.rej-filer" - -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "tillåt överlappande stycken" - -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" - -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "lite inte på antalet linjer i styckehuvuden" - -#: builtin/apply.c:4862 -msgid "prepend <root> to all filenames" -msgstr "lägg till <rot> i alla filnamn" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -4070,112 +4564,165 @@ msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "" +"Använd en experimentell indenteringsbaserad algoritm för att förbättra diffar" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "" +"Använd en experimentell algoritm baserad på tomma rader för att förbättra " +"diffar" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "poäng" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: 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 "Behandla endast radintervallet n,m, med början på 1" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress kan inte användas med --incremental eller porslinsformat" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents och --reverse fungerar inte så bra tillsammans." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse och --first-parent tillsammans kräver att du anger senaste " +"incheckningen" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" +"kedjan" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "sökvägen %s i %s finns inte" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "kan inte läsa objektet %s för sökvägen %s" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "filen %s har bara %lu rad" +msgstr[1] "filen %s har bara %lu rader" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" @@ -4424,6 +4971,10 @@ msgstr "uppströms" msgid "change the upstream info" msgstr "ändra uppströmsinformationen" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "ta bort uppströmsinformationen" + #: builtin/branch.c:661 msgid "use colored output" msgstr "använd färgad utdata" @@ -4496,8 +5047,8 @@ msgstr "nyckel" msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: 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 "objekt" @@ -4510,7 +5061,7 @@ msgstr "visa endast grenar för objektet" msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: 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 hittades inte under refs/heads!" @@ -4622,64 +5173,80 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:443 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<type>|--textconv) <object>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<typ>|--textconv) <objekt>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: 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 "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" -msgstr "för blob-objekt, kör textconv på objektets innehåll" +msgstr "för blob-objekt, kör filter på objektets innehåll" + +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "för blob-objekt, kör filger på objektets innehåll" + +#: 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 "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" @@ -4699,7 +5266,7 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: 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 "läs filnamn från standard in" @@ -4707,7 +5274,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: 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 "undertryck förloppsrapportering" @@ -4797,9 +5364,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: 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 "sträng" @@ -4870,54 +5437,54 @@ msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:668 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%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 "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:683 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:734 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:740 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4940,7 +5507,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" @@ -4967,151 +5534,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:795 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:799 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: 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 "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:971 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1011 builtin/worktree.c:214 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1040 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1079 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: 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\" kan inte användas vid byte av gren" -#: 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\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1144 builtin/worktree.c:328 +#: builtin/checkout.c:1143 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1154 builtin/merge.c:231 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: 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 "stil" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c: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 "tvinga förloppsrapportering" -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1253 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5120,12 +5687,12 @@ msgstr "" "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: 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 tar inte en sökväg som argument \"%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." @@ -5278,8 +5845,8 @@ msgstr "städa interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: 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 "mönster" @@ -5319,113 +5886,130 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: 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 "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:80 builtin/init-db.c:473 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "mallkatalog" -#: 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 "katalog att använda mallar från" -#: 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 "referensarkiv" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: 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 "namn" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: 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 "djup" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "tid" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "skapa en grund klon från en angiven tidpunkt" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "revision" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "fördjupa historik för grund klon genom att exkludera revision" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:98 builtin/init-db.c:482 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "gitkat" -#: 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 "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: 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 "använd endast IPv4-adresser" -#: 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 "använd endast IPv6-adresser" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5433,57 +6017,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:307 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "referensarkivet \"%s\" är grunt" - -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "referensarkivet \"%s\" är ympat" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "klart.\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" @@ -5493,122 +6062,138 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"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 "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:863 builtin/receive-pack.c:1855 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: 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 "djupet %s är inte ett positivt tal" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: 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 "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%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 är inte kompatibel med --reference och --reference-if-able" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:1000 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället" + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället" + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %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 "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -5748,66 +6333,66 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: 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 "kunde inte skriva filen new_index" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %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" @@ -5815,38 +6400,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: 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 "kunde inte slå upp incheckningen %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 "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5861,7 +6446,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5876,7 +6461,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5886,7 +6471,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5897,146 +6482,150 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: 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 "Ange meddelandet en av flaggorna -m eller -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' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: 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 "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -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 kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "visa information om gren" -#: 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 "maskinläsbar utdata" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "terminera poster med 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 "läge" -#: 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 "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6044,201 +6633,201 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1596 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "author" msgstr "författare" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1598 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "datum" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: 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 "meddelande" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "commit message" msgstr "incheckningsmeddelande" -#: 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 "incheckning" -#: builtin/commit.c:1600 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c: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 "lägg till Signed-off-by:" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "standard" -#: 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 "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\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" @@ -6405,11 +6994,20 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%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 "" +"kan inte skriva över flera värden med ett ensamt värde\n" +" Använd en regexp, --add eller --replace-all för att ändra %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 "skriv storlekar i människoläsbart format" @@ -6529,7 +7127,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)" msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: 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 "visa förkortade incheckningsobjekt som standard" @@ -6563,21 +7161,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -6650,161 +7248,165 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: 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 "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: 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 "sökväg till upload pack på fjärren" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: 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 "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: 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 "fördjupa historik för grund klon" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "fördjupa historik för grund klon baserad på tid" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "kat" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: 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 "[refuserad]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: 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 "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6813,55 +7415,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %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 "Kunde inte hämta %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." @@ -6869,32 +7471,40 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "Negativa djup stöds inte i --deepen" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen och --depth är ömsesidigt uteslutande" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -6904,23 +7514,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "fil att läsa från" @@ -7038,7 +7648,7 @@ msgstr "visa förlopp" msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -7131,224 +7741,219 @@ msgstr "grep: misslyckades skapa tråd. %s" msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %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 "kunde inte läsa träd (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "kan inte öppna \"%s\"" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "inget mönster angavs." -#: 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 "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -7364,84 +7969,88 @@ 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 "typ" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "uteslut vägledningar" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "lista användbara vägledningar" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "visa info-sida" -#: 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] [<kommando>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 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 "exec misslyckades för \"%s\"" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7450,7 +8059,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7459,299 +8068,303 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:401 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:402 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "Git för dagligt bruk i ungefär 20 kommandon" -#: builtin/help.c:403 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:404 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:405 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:406 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:407 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Introduktion till Git (för version 1.5.1 och senare)" -#: builtin/help.c:408 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:420 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:441 builtin/help.c:458 -#, c-format -msgid "usage: %s%s" -msgstr "användning: %s%s" - -#: builtin/help.c:474 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "användning: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %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] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "paket är större än tillåten maximal storlek" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: 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] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 -#: builtin/index-pack.c:808 builtin/index-pack.c:817 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %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 "kunde inte läsa %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: 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] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: 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] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig 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 "trådstöd saknas, ignorerar %s" @@ -7791,95 +8404,95 @@ msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s finns redan" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s finns redan" + +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %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 "Ominitierade befintligt Git-arkiv i %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 "Initierade tomt delat Git-arkiv i %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 "Initierade tomt Git-arkiv i %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>]" @@ -7887,25 +8500,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: 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 "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %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-" @@ -7914,7 +8527,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -8025,37 +8638,34 @@ msgstr "Inte ett intervall." msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1064 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: 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 "Okänd incheckning %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 "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: 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" @@ -8066,307 +8676,315 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1283 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1294 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1298 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1347 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: 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 "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "Använd [RFC PATCH] istället för [PATCH]" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "huvud" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1443 builtin/log.c:1445 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "epost" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"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 "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1452 builtin/log.c:1455 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "signatur" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix och -k kan inte användas samtidigt." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "rekursera ner i undermoduler" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -8483,32 +9101,32 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: 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 "visa inte en diffstat när sammanslagningen är färdig" -#: 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 "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(synonym till --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 "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: 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 "skapa en ensam incheckning istället för en sammanslagning" -#: 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 "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" @@ -8516,28 +9134,28 @@ msgstr "redigera meddelande innan incheckning" msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: 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 "avbryt om snabbspolning inte är möjlig" -#: 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 "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: 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 "strategi" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" @@ -8549,7 +9167,7 @@ msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:227 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" @@ -8771,55 +9389,55 @@ msgstr "vägrar slå samman orelaterad historik" msgid "Already up-to-date." msgstr "Redan à jour." -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: 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 "Återspolar trädet till orört...\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8845,23 +9463,23 @@ msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> <incheckning>" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "se var <incheckning> grenades av från referensloggen från <ref>" @@ -8905,6 +9523,37 @@ msgstr "varna inte om konflikter" msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "okänd flagga %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "kunde inte tolka objektet \"%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] "kan inte hantera mer än %d bas. Ignorerar %s." +msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "hanterar inte något annat än en sammanslagning av två huvuden." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "kunde inte bestämma referensen %s" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Slår ihop %s med %s\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9014,43 +9663,43 @@ msgstr "Byter namn på %s till %s\n" msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -9185,8 +9834,8 @@ msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" #: builtin/notes.c:194 -msgid "Please supply the note contents using either -m or -F option" -msgstr "Ange innehåll för anteckningen med antingen -m eller -F" +msgid "please supply the note contents using either -m or -F option" +msgstr "ange innehåll för anteckningen med antingen -m eller -F" #: builtin/notes.c:203 msgid "unable to write note object" @@ -9194,8 +9843,8 @@ msgstr "kunde inte skriva anteckningsobjekt" #: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" -msgstr "Anteckningens innehåll har lämnats kvar i %s" +msgid "the note contents have been left in %s" +msgstr "anteckningens innehåll har lämnats kvar i %s" #: builtin/notes.c:233 builtin/tag.c:439 #, c-format @@ -9207,52 +9856,76 @@ msgstr "kunde inte läsa \"%s\"" msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%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 "kunde inte slå upp \"%s\" som en giltig referens." + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." -msgstr "Kunde inte läsa objektet \"%s\"." +msgid "failed to read object '%s'." +msgstr "kunde inte läsa objektet \"%s\"." #: 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 "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "felaktig indatarad: \"%s\"." + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%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 "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "för många parametrar" -#: 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 "Inga anteckningar hittades för objektet %s." +msgid "no note found for object %s." +msgstr "inga anteckningar hittades för objektet %s." -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9261,29 +9934,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: 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 "Skriver över befintliga anteckningar för objektet %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 "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9292,12 +9965,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." +msgid "missing notes on source object %s. Cannot copy." +msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: 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" @@ -9306,20 +9979,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "misslyckades bestämma NOTES_MERGE_REF" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "misslyckades färdigställa sammanslagning av anteckningar" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9327,48 +10032,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" -msgstr "Måste ange en antecknings-referens att slå ihop" +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" +msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:821 +#: builtin/notes.c:823 #, c-format -msgid "Unknown -s/--strategy: %s" -msgstr "Okänd -s/--strategy: %s" +msgid "unknown -s/--strategy: %s" +msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "Sammanslagning av anteckningar till %s är redan igångsatt på %s" +msgid "a notes merge into %s is already in-progress at %s" +msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" -msgstr "Kunde inte lagra länk till aktuell anteckningsreferens (%s)" +msgid "failed to store link to current notes ref (%s)" +msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%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 " @@ -9379,225 +10084,221 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: 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 "ta inte bort, bara visa" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" -msgstr "Okänt underkommando: %s" +msgid "unknown subcommand: %s" +msgstr "okänt underkommando: %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 [<flaggor>...] [< <reflista> | < <objektlista>]" -#: 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 [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: 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 "fel i deflate (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: 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 "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "tid" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2704 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2706 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2710 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2712 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2714 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:2716 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "Räknar objekt" @@ -9637,53 +10338,45 @@ msgstr "låt tid gå ut för objekt äldre än <tid>" msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Felaktigt värde för %s: %s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:147 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:379 git-sh-setup.sh:226 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." - -#: builtin/pull.c:385 git-sh-setup.sh:252 -msgid "Additionally, your index contains uncommitted changes." -msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." - -#: builtin/pull.c:387 git-sh-setup.sh:245 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9691,14 +10384,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: 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." @@ -9706,7 +10399,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9717,42 +10410,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: 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 "Du är inte på någon gren för närvarande." -#: 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 "Ange vilken gren du vill ombasera mot." -#: 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 "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: 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 "<fjärr>" -#: 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 "<gren>" -#: 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 "Det finns ingen spårningsinformation för aktuell gren." -#: 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 "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9761,19 +10454,27 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:820 +#: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:867 +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:875 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:903 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "pull med ombasering" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "checka in eller använd \"stash\" på dem." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9784,7 +10485,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:908 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9801,11 +10502,11 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:923 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:927 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." @@ -10180,15 +10881,66 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: 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 "" +"Normalt tillåts inte uppdatering av aktuell gren i ett icke-naket\n" +"arkiv, då index och arbetskatalog inte kommer stämma med det du\n" +"sände och \"git reset --hard\" krävs för att få arbetskatalogen och\n" +"HEAD att stämma överens.\n" +"\n" +"Du kan ställa in variabeln \"receive.denyCurrentBranch\" till\n" +"\"ignore\" eller \"warn\" i fjärrarkivet för att tillåta sändning till\n" +"dess aktuella gren; detta rekommenderas dock inte såvida du inte\n" +"sett till att dess arbetskatalog uppdateras till det tu sände in\n" +"på annat sätt.\n" +"\n" +"För att undvika detta meddelande och fortfarande behålla det\n" +"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." + +#: builtin/receive-pack.c: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 "" +"Normalt tillåts inte radering av aktuell gren, eftersom nästa\n" +"\"git clone\" inte kommer innebära att några filer checkas ut,\n" +"vilket är förvirrande.\n" +"\n" +"Du kan ställa in variabeln \"receive.denyDeleteCurrent\" till\n" +"\"warn\" eller \"ignore\" i fjärrarkivet för att tillåta borttagning\n" +"av aktuell gren, med eller utan varningsmeddelande.\n" +"\n" +"För att undvika detta meddelande kan du sätta det till \"refuse\"." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1857 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -10517,7 +11269,7 @@ msgstr "* fjärr %s" msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(ingen URL)" @@ -10554,7 +11306,7 @@ msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1179 builtin/remote.c:1206 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr " (status inte förfrågad)" @@ -10568,138 +11320,143 @@ msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"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] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1224 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1226 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1241 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1243 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1253 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1282 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1292 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "Rensar %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 " * [skulle rensa] %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: 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 "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1436 +#: builtin/remote.c:1435 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1443 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1460 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1462 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1490 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1516 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1518 +#: builtin/remote.c:1517 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1520 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1527 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1568 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" @@ -10886,8 +11643,8 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -11006,27 +11763,27 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:362 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: 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" @@ -11118,7 +11875,7 @@ msgstr "behåll redundanta, tomma incheckningar" msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:207 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -11286,70 +12043,126 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: 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] "ignorerar %s; kan inte hantera mer än %d referens" +msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "inga motsvarande referenser med %s" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-" +"base" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "inga grenar angavs, och HEAD är inte giltigt" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "--reflog behöver ett namn på en gren" + +#: 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] "maximalt %d poster kan visas samtidigt." +msgstr[1] "maximalt %d poster kan visas samtidigt." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "ingen sådan referens %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] "kan inte hantera mer än %d revision." +msgstr[1] "kan inte hantera mer än %d revisioner." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "\"%s\" är inte en giltig referens." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "hittar inte incheckning %s (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11410,12 +12223,12 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %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 "Förväntade fullt referensnamn, fick %s" @@ -11425,74 +12238,93 @@ msgstr "Förväntade fullt referensnamn, fick %s" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%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 "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: 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 "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:364 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:368 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%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 "varning: kommandouppdateringsläge föreslogs för undermodulen \"%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 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:430 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%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 "undermodulen \"%s\" kan inte lägga till alternativ: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:504 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "tvinga kloningsförlopp" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11500,97 +12332,97 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: 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 "kunde inte skapa katalogen \"%s\"" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "kan inte öppna filen \"%s\"" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "kunde inte stänga filen %s" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:641 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:662 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:792 +#: builtin/submodule--helper.c:913 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:803 +#: builtin/submodule--helper.c:924 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:831 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:838 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:840 +#: builtin/submodule--helper.c:961 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:841 +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: 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=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:927 +#: builtin/submodule--helper.c:1050 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -11599,11 +12431,11 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "underkommandot submodule--helper måste anropas med ett underkommando" -#: builtin/submodule--helper.c:984 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -11840,7 +12672,7 @@ msgstr "taggen \"%s\" finns redan" msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -11905,131 +12737,147 @@ msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort msgid " OK" msgstr " OK" -#: builtin/update-index.c:575 +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: 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 är satt till true; ta bort eller ändra det om du " +"verkligen vill inaktivera den ospårade cachen" + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: 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 är satt till false; ta bort eller ändra det om du " +"verkligen vill aktivera den ospårade cachen" + +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" @@ -12227,26 +13075,39 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: upload-pack.c:20 +#: upload-pack.c:22 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:837 +#: upload-pack.c:1028 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:839 +#: upload-pack.c:1030 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:841 +#: upload-pack.c:1032 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" -#: upload-pack.c:843 +#: upload-pack.c:1034 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" +#: 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 "" +"Behörigheten på din uttags-katalog (socket) är för lös; andra\n" +"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n" +"\n" +"\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" @@ -12261,7 +13122,11 @@ msgstr "" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" för att läsa mer om specifika underkommandon och koncept." -#: http.c:323 +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" @@ -12377,15 +13242,15 @@ msgstr "giltig-till" msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:237 +#: parse-options.h:238 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:239 +#: parse-options.h:240 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:245 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -12610,8 +13475,8 @@ msgid "Automated merge did not work." msgstr "Automatisk sammanslagning misslyckades." #: git-merge-octopus.sh:62 -msgid "Should not be doing an Octopus." -msgstr "Borde inte använda Octopus." +msgid "Should not be doing an octopus." +msgstr "Borde inte använda octopus." #: git-merge-octopus.sh:73 #, sh-format @@ -12796,6 +13661,10 @@ msgstr "Du har inte den första incheckningen ännu" msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" +#: git-stash.sh:103 +msgid "Cannot save the untracked files" +msgstr "Kan inte spara ospårade filer" + #: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" @@ -12836,6 +13705,11 @@ msgstr "" "fel: felaktig flagga för \"stash save\": $option\n" " För att ange ett meddelande, använd git stash save -- \"$option\"" +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" +"Kan inte använda --patch och --include-untracked eller --all samtidigt." + #: git-stash.sh:259 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" @@ -12857,96 +13731,100 @@ msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:404 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:414 +#: git-stash.sh:416 msgid "No stash found." msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:421 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:427 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:455 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:466 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:474 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:478 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:486 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:488 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:522 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "Kunde inte återställa ospårade filer från stash" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:537 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:551 +#: git-stash.sh:562 msgid "The stash is kept in case you need it again." msgstr "\"Stash\":en behålls ifall du behöver den igen." -#: git-stash.sh:560 +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:561 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:569 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:641 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"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 "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:193 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:210 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:214 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12957,22 +13835,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:232 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: 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\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:242 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: 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" @@ -12990,48 +13868,48 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:262 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:267 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:276 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:323 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "Går in i \"$displaypath\"" -#: git-submodule.sh:343 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "sökvägsangivelse och --all är inkompatibla" -#: git-submodule.sh:419 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:439 +#: git-submodule.sh:440 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13040,7 +13918,7 @@ msgstr "" "Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:447 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13049,38 +13927,38 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:450 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:451 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:454 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:463 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:622 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:627 +#: git-submodule.sh:632 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -13089,12 +13967,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:645 +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:651 +#: git-submodule.sh:656 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -13103,88 +13981,84 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:658 +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:659 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:663 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:664 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:669 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:670 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:675 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:676 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:707 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:815 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:867 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:887 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:890 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $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 "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$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 "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1107 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -13479,8 +14353,12 @@ msgstr "" "Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar." #: git-rebase--interactive.sh:1044 -msgid "You can fix this with 'git rebase --edit-todo'." -msgstr "Du kan rätta detta med \"git rebase --edit-todo\"." +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "" +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" +"continue\"." #: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." @@ -13503,7 +14381,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 "" @@ -13551,44 +14429,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 "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:1145 -msgid "You need to set your committer info first" -msgstr "Du måste ställa in din incheckarinformation först" - -#: git-rebase--interactive.sh:1153 +#: git-rebase--interactive.sh:1150 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1155 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:1159 +#: git-rebase--interactive.sh:1156 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:1161 +#: git-rebase--interactive.sh:1158 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: 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 "Kunde inte initiera omskrivna incheckningar" -#: 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] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--interactive.sh:1281 +#: git-rebase--interactive.sh:1278 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -13598,7 +14472,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1285 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -13625,6 +14499,10 @@ msgstr "Kan inte ombasera: Du har oköade ändringar." msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Kan inte skriva om grenar: Du har oköade ändringar." +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." + #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." @@ -13635,12 +14513,21 @@ msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in." +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." + #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Kan inte $action: Ditt index innehåller ändringar som inte checkats in." +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." + #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." @@ -13649,6 +14536,42 @@ msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" +#~ msgid "Could not write to %s" +#~ msgstr "Kunde inte skriva till %s" + +#~ msgid "Error wrapping up %s." +#~ msgstr "Fel vid ombrytning av %s." + +#~ msgid "Your local changes would be overwritten by cherry-pick." +#~ msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." + +#~ msgid "Cannot revert during another revert." +#~ msgstr "Kan inte utföra \"revert\" under en annan \"revert\"." + +#~ msgid "Cannot cherry-pick during another cherry-pick." +#~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"." + +#~ msgid "Could not parse line %d." +#~ msgstr "Kan inte tolka rad %d." + +#~ msgid "Could not open %s" +#~ msgstr "Kunde inte öppna %s" + +#~ msgid "Could not read %s." +#~ msgstr "kunde inte läsa %s." + +#~ msgid "Could not format %s." +#~ msgstr "Kunde inte formatera %s." + +#~ msgid "%s: %s" +#~ msgstr "%s: %s" + +#~ msgid "cannot open %s: %s" +#~ msgstr "kan inte öppna %s: %s" + +#~ msgid "You need to set your committer info first" +#~ msgstr "Du måste ställa in din incheckarinformation först" + #~ msgid "bad numeric config value '%s' for '%s': invalid unit" #~ msgstr "" #~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": ogiltig enhet" @@ -13832,9 +14755,6 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "Verify that the named commit has a valid GPG signature" #~ msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#~ msgid "Could not write to '%s'" -#~ msgstr "Kunde inte skriva till \"%s\"" - #~ msgid "Writing SQUASH_MSG" #~ msgstr "Skriver SQUASH_MSG" @@ -14458,9 +15378,6 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "-d option is no longer supported. Do not use." #~ msgstr "Flaggan -d stöds inte lägre. Använd inte." -#~ msgid "cherry-pick" -#~ msgstr "cherry-pick" - #~ msgid "Could not extract email from committer identity." #~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.10.0-rc2\n" +"Project-Id-Version: git v2.11.0\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 07:19+0700\n" +"POT-Creation-Date: 2016-11-22 22:10+0800\n" +"PO-Revision-Date: 2016-11-22 22:17+0800\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -113,6 +113,621 @@ msgstr "" " git checkout -b <tên-nhánh-mới>\n" "\n" +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" + +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject và --3way không thể dùng cùng nhau." + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached và --3way không thể dùng cùng nhau." + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way ở ngoài một kho chứa" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index ở ngoài một kho chứa" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached ở ngoài một kho chứa" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "" +"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " +"%s" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %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 sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" + +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" + +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" + +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" + +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "chi tiết: dòng không cần: %.*s" + +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %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] "" +"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " +"thành phần dẫn đầu tên của đường dẫn (dòng %d)" + +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)" + +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "tập tin mới phụ thuộc vào nội dung cũ" + +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "tập tin đã xóa vẫn còn nội dung" + +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "miếng vá hỏng tại dòng %d" + +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" + +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "tập tin đã xóa %s vẫn còn nội dung" + +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" + +#: apply.c:1984 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" + +#: apply.c:2021 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" + +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "vá chỉ với “rác” tại dòng %d" + +#: apply.c:2274 +#, c-format +msgid "unable to read symlink %s" +msgstr "không thể đọc liên kết mềm %s" + +#: apply.c:2278 +#, c-format +msgid "unable to open or read %s" +msgstr "không thể mở hay đọc %s" + +#: apply.c:2931 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "sai khởi đầu dòng: “%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] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." + +#: apply.c:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" + +#: apply.c:3068 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"trong khi đang tìm kiếm cho:\n" +"%.*s" + +#: apply.c:3090 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" + +#: apply.c:3098 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" +"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược hunk thành " +"“%s”" + +#: apply.c:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "" +"không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy " +"đủ" + +#: apply.c:3154 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại." + +#: apply.c:3162 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống" + +#: apply.c:3180 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "không thể đọc postimage %s cần thiết cho “%s”" + +#: apply.c:3193 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" + +#: apply.c:3199 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " +"%s)" + +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "gặp lỗi khi vá: %s:%ld" + +#: apply.c:3342 +#, c-format +msgid "cannot checkout %s" +msgstr "không thể lấy ra %s" + +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#, c-format +msgid "failed to read %s" +msgstr "gặp lỗi khi đọc %s" + +#: apply.c:3398 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" + +#: apply.c:3427 apply.c:3667 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" + +#: apply.c:3510 apply.c:3681 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: không tồn tại trong bảng mục lục" + +#: apply.c:3519 apply.c:3689 +#, c-format +msgid "%s: does not match index" +msgstr "%s: không khớp trong mục lục" + +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "Đang trở lại hòa trộn “3-đường”…\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "không thể đọc nội dung hiện hành của “%s”" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Đã áp dụng miếng vá %s với các xung đột.\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "loại bỏ miếng vá để lại nội dung tập tin" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "%s: sai kiểu" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s có kiểu %o, cần %o" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "đường dẫn không hợp lệ “%s”" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: đã có từ trước trong bảng mục lục" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: đã sẵn có trong thư mục đang làm việc" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" + +#: apply.c:3945 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" + +#: apply.c:3965 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" + +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: miếng vá không được áp dụng" + +#: apply.c:3984 +#, c-format +msgid "Checking patch %s..." +msgstr "Đang kiểm tra miếng vá %s…" + +#: apply.c:4075 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s" + +#: apply.c:4082 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại" + +#: apply.c:4085 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)." + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "không thể thêm %s vào chỉ mục tạm thời" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "không thểghi mục lục tạm vào %s" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "không thể gỡ bỏ %s từ mục lục" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "miếng vá sai hỏng cho mô-đun-con %s" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "không thể thêm mục nhớ đệm cho %s" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "gặp lỗi khi ghi vào “%s”" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "đang đóng tập tin “%s”" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "không thể ghi vào tập tin “%s” chế độ %o" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." + +#: apply.c:4518 +msgid "internal error" +msgstr "lỗi nội bộ" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "không mở được “%s”" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Khối nhớ #%d được áp dụng gọn gàng." + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "đoạn dữ liệu #%d bị từ chối." + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "bỏ qua đường dẫn “%s”." + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "không thừa nhận đầu vào" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "không thể đọc tập tin lưu bảng mục lục" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "không thể mở miếng vá “%s”: %s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d dòng thêm khoảng trắng lỗi." + +#: 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 dòng được áp dụng sau khi sửa các lỗi khoảng trắng." + +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "Không thể ghi tập tin lưu bảng mục lục mới" + +#: 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 "đường-dẫn" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "số" + +#: apply.c:4926 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" +"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "" +"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" +"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "" +"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" + +#: apply.c:4956 +msgid "ensure at least <n> lines of context match" +msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "hành động" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "áp dụng miếng vá theo chiều ngược" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "đừng hy vọng có ít nhất một dòng nội dung" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "cho phép chồng khối nhớ" + +#: 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 "chi tiết" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" +"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "gốc" + +#: apply.c:4982 +msgid "prepend <root> to all filenames" +msgstr "treo thêm <root> vào tất cả các tên tập tin" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]" @@ -132,7 +747,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --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 "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" @@ -145,7 +760,7 @@ msgstr "định_dạng" msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:430 builtin/log.c:1422 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "tiền_tố" @@ -153,11 +768,11 @@ msgstr "tiền_tố" msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: 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 "tập_tin" @@ -189,8 +804,8 @@ msgstr "nén nhỏ hơn" msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" -#: 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 "kho" @@ -198,7 +813,7 @@ msgstr "kho" msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ" -#: 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 "lệnh" @@ -472,27 +1087,27 @@ msgstr "" "sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n" "\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push." -#: branch.c:266 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "Không phải tên đối tượng hợp lệ: “%s”." -#: branch.c:286 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Tên đối tượng chưa rõ ràng: “%s”." -#: branch.c:291 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Nhánh không hợp lệ: “%s”." -#: branch.c:345 +#: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "“%s” đã được lấy ra tại “%s” rồi" -#: branch.c:364 +#: branch.c:363 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD của cây làm việc %s chưa được cập nhật" @@ -507,7 +1122,7 @@ msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump c msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %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 "không thể mở “%s”" @@ -516,9 +1131,9 @@ msgstr "không thể mở “%s”" msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:" -#: 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 "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" @@ -556,7 +1171,7 @@ msgstr "rev-list đã chết" msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn 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 "đối số không được thừa nhận: %s" @@ -579,8 +1194,8 @@ msgstr "mục lục gói đã chết" msgid "invalid color value: %.*s" msgstr "giá trị màu không hợp lệ: %.*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 "không thể phân tích cú pháp %s" @@ -590,6 +1205,16 @@ msgstr "không thể phân tích cú pháp %s" msgid "%s %s is not a commit!" msgstr "%s %s không phải là một lần chuyển giao!" +#: 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 "" +"Cảnh báo: ghi chú cho lần chuyển giao không hợp chuẩn UTF-8.\n" +"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n" +"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "hết bộ nhớ" @@ -674,7 +1299,7 @@ msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong msgid "failed to expand user dir in: '%s'" msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”" -#: config.c:849 config.c:860 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" @@ -717,22 +1342,66 @@ msgstr "không thể đặt “%s” thành “%s”" msgid "could not unset '%s'" msgstr "không thể thôi đặt “%s”" +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "Máy chủ bị treo trên lần tiếp xúc đầu tiên" + +#: 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 "" +"Không thể đọc từ kho trên mạng.\n" +"\n" +"Vui lòng chắc chắn là bạn có đủ thẩm quyền truy cập\n" +"và kho chứa đã sẵn có." + #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" -#: connected.c:74 +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" -#: connected.c:94 +#: connected.c:95 msgid "failed write to rev-list" msgstr "gặp lỗi khi ghi vào rev-list" -#: connected.c:101 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list" +#: convert.c:201 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"CRLF sẽ bị thay thế bằng LF trong %s.\n" +"Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn." + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "CRLF nên được thay bằng LF trong %s." + +#: convert.c:211 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"LF sẽ bị thay thế bằng CRLF trong %s.\n" +"Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn." + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "LF nên thay bằng CRLF trong %s" + #: date.c:97 msgid "in the future" msgstr "trong tương lai" @@ -797,26 +1466,31 @@ msgstr[0] "%lu năm trước" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:540 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" -#: diff.c:116 +#: diff.c:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "tùy chọn “%s” yêu cầu một giá trị" + +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n" -#: diff.c:121 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Không hiểu đối số dirstat “%s”\n" -#: diff.c:225 +#: diff.c:283 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”" -#: diff.c:277 +#: diff.c:346 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -825,16 +1499,20 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:3017 +#: diff.c:3087 #, c-format msgid "external diff died, stopping at %s" msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s" -#: diff.c:3415 +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau" + +#: diff.c:3502 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:3578 +#: diff.c:3665 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -843,61 +1521,246 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3592 +#: diff.c:3679 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" -#: dir.c:1823 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "" +"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin." + +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." +msgstr "" +"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin." + +#: diff.c:4706 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần " +"nữa." + +#: dir.c:1866 msgid "failed to get kernel name and information" msgstr "gặp lỗi khi lấy tên và thông tin của nhân" -#: dir.c:1942 +#: dir.c:1985 msgid "Untracked cache is disabled on this system or location." msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này." -#: gpg-interface.c:178 +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: cần danh sách shallow" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF" + +#: fetch-pack.c:243 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”" + +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc cần multi_ack_detailed" + +#: fetch-pack.c:381 +#, c-format +msgid "invalid shallow line: %s" +msgstr "dòng shallow không hợp lệ: %s" + +#: fetch-pack.c:387 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "dòng unshallow không hợp lệ: %s" + +#: fetch-pack.c:389 +#, c-format +msgid "object not found: %s" +msgstr "Không tìm thấy đối tượng: %s" + +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" +msgstr "lỗi trong đối tượng: %s" + +#: fetch-pack.c:394 +#, c-format +msgid "no shallow found: %s" +msgstr "không tìm shallow nào: %s" + +#: fetch-pack.c:397 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "cần shallow/unshallow, nhưng lại nhận được %s" + +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" +msgstr "nhận %s %d - %s" + +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "lần chuyển giao %s không hợp lệ" + +#: fetch-pack.c:483 +msgid "giving up" +msgstr "chịu thua" + +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "xong" + +#: fetch-pack.c:505 +#, c-format +msgid "got %s (%d) %s" +msgstr "nhận %s (%d) %s" + +#: fetch-pack.c:551 +#, c-format +msgid "Marking %s as complete" +msgstr "Đánh dấu %s là đã hoàn thành" + +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" +msgstr "đã sẵn có %s (%s)" + +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "lỗi giao thức: phần đầu gói bị sai" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: không thể rẽ nhánh %s" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "%s gặp lỗi" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "có lỗi trong sideband demultiplexer" + +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "Máy chủ không hỗ trợ máy khách shallow" + +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "Máy chủ hỗ trợ multi_ack_detailed" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "Máy chủ hỗ trợ no-done" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "Máy chủ hỗ trợ multi_ack" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "Máy chủ hỗ trợ side-band-64k" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "Máy chủ hỗ trợ side-band" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "Máy chủ hỗ trợ ofs-delta" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "Phiên bản máy chủ là %.*s" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "Máy chủ không hỗ trợ --shallow-since" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "Máy chủ không hỗ trợ --shallow-exclude" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "Máy chủ không hỗ trợ --deepen" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "không có lần chuyển giao chung nào" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: fetch gặp lỗi." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "không khớp phần đầu máy chủ" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg gặp lỗi khi ký dữ liệu" -#: gpg-interface.c:208 +#: gpg-interface.c:215 msgid "could not create temporary file" msgstr "không thể tạo tập tin tạm thời" -#: gpg-interface.c:210 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”" -#: grep.c:1792 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi khi lấy thống kê về “%s”" -#: grep.c:1820 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "“%s”: đọc ngắn" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "các lệnh git sẵn có trong thư mục “%s”:" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:" -#: help.c:309 +#: help.c:306 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -906,11 +1769,11 @@ msgstr "" "“%s” trông như là một lệnh git, nhưng chúng tôi không\n" "thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?" -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả." -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -919,17 +1782,17 @@ msgstr "" "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" "Tiếp tục và coi rằng ý bạn là “%s”" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "trong %0.1f giây một cách tự động…" -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”." -#: help.c:404 help.c:470 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -940,11 +1803,37 @@ msgstr[0] "" "\n" "Có phải ý bạn là một trong số những cái này không?" -#: 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" +"*** Vui lòng cho biết bạn là ai.\n" +"\n" +"Chạy\n" +"\n" +" git config --global user.email \"bạn@ví_dụ.com\"\n" +" git config --global user.name \"Tên Của Bạn\"\n" +"\n" +"để đặt định danh mặc định cho tài khoản của bạn.\n" +"Bỏ tùy chọn --global nếu chỉ định danh riêng cho kho này.\n" +"\n" + #: lockfile.c:152 #, c-format msgid "" @@ -973,8 +1862,8 @@ msgstr "Không thể tạo “%s.lock”: %s" msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: 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 "không thể ghi tập tin lưu bảng mục lục mới" @@ -1010,7 +1899,7 @@ msgstr ": có lẽ là một xung đột D/F?" msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:796 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" @@ -1151,7 +2040,7 @@ msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1736 git-submodule.sh:919 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "mô-đun-con" @@ -1217,6 +2106,23 @@ msgstr "Không thể phân tích đối tượng “%s”" msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" +#: 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 "" +"Bạn đã chưa hoàn tất hòa trộn ghi chú trước đây (%s vẫn còn).\n" +"Vui lòng dùng “git notes merge --commit” hay “git notes merge --abort” để " +"chuyển giao hay bãi bỏ lần hòa trộn trước đây và bắt đầu một hòa trộn ghi " +"chú mới." + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)." + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" @@ -1275,7 +2181,7 @@ msgstr "-SỐ" msgid "malformed object name '%s'" msgstr "tên đối tượng dị hình “%s”" -#: path.c:798 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" @@ -1332,12 +2238,20 @@ msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %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 "" +"chuỗi rỗng làm đặc tả đường dẫn không hợp lệ ở lần phát hành kế tiếp. Vui " +"lòng dùng . để thay thế nếu ý bạn là khớp mọi đường dẫn" + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1345,15 +2259,11 @@ msgstr "" "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n" "Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?" -#: pretty.c:973 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" -#: progress.c:235 -msgid "done" -msgstr "xong" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1362,7 +2272,7 @@ msgstr "" "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1371,22 +2281,22 @@ msgstr "" "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: refs.c:551 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở “%s” để ghi" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "không thể xóa bỏ tham chiếu %s: %s" -#: refs/files-backend.c:2537 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "không thể xóa bỏ tham chiếu: %s" -#: refs/files-backend.c:2546 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "không thể gỡ bỏ tham chiếu: %s" @@ -1515,12 +2425,12 @@ msgstr "đang lờ đi tham chiếu với tên hỏng %s" msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" @@ -1644,37 +2554,37 @@ msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " "bạn)\n" -#: revision.c:2132 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng" -#: revision.c:2135 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả" -#: revision.c:2329 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khắc với --bisect" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "gặp lỗi khi mở “/dev/null”" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) gặp lỗi" -#: send-pack.c:298 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "gặp lỗi khi ký chứng thực đẩy" -#: send-pack.c:411 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "kết thúc nhận không hỗ trợ đẩy --signed" -#: send-pack.c:413 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -1682,15 +2592,23 @@ msgstr "" "đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --" "signed" -#: send-pack.c:425 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "kết thúc nhận không hỗ trợ đẩy --atomic" -#: send-pack.c:430 +#: send-pack.c:429 msgid "the receiving end does not support push options" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" -#: sequencer.c:174 +#: sequencer.c:171 +msgid "revert" +msgstr "hoàn nguyên" + +#: 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>'" @@ -1698,7 +2616,7 @@ msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”" -#: 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" @@ -1708,232 +2626,258 @@ msgstr "" "với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" "và chuyển giao kết quả bằng lệnh “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 "Không thể ghi vào %s" +msgid "could not lock '%s'" +msgstr "không thể khóa “%s”" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, c-format -msgid "Error wrapping up %s." -msgstr "Lỗi bao bọc %s." +msgid "could not write to '%s'" +msgstr "không thể ghi vào “%s”" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick." +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s" +msgstr "không thể ghi eol vào “%s”" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh hoàn nguyên." +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "gặp lỗi khi finalize “%s”" -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "Không thể đọc “%s”." -#: sequencer.c:228 +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s." + +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." + +#: sequencer.c:324 #, c-format msgid "%s: fast-forward" msgstr "%s: chuyển-tiếp-nhanh" #. 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: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" -msgstr "Không thể phân giải lần chuyển giao HEAD\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" +msgstr "không thể phân giải lần chuyển giao HEAD\n" + +#: sequencer.c:438 +msgid "unable to update cache tree\n" +msgstr "không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" -msgstr "Không thể cập nhật cây bộ nhớ đệm\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 "" +"bạn có các thay đổi so với trong bệ phóng trong thư mục làm việc của bạn.\n" +"Nếu các thay đổi này là muốn squash vào lần chuyển giao kế trước, chạy:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n" +"\n" +" git commit %s\n" +"\n" +"Trong cả hai trường hợp, một khi bạn làm xong, tiếp tục bằng:\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:393 +#: sequencer.c:567 #, c-format -msgid "Could not parse commit %s\n" -msgstr "Không thể phân tích lần chuyển giao %s\n" +msgid "could not parse commit %s\n" +msgstr "không thể phân tích lần chuyển giao %s\n" -#: sequencer.c:398 +#: sequencer.c:572 #, c-format -msgid "Could not parse parent commit %s\n" -msgstr "Không thể phân tích lần chuyển giao cha mẹ “%s”\n" +msgid "could not parse parent commit %s\n" +msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”\n" -#: sequencer.c:463 -msgid "Your index file is unmerged." -msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." +#: sequencer.c:656 +msgid "your index file is unmerged." +msgstr "tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:482 +#: sequencer.c:675 #, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "Lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." +msgid "commit %s is a merge but no -m option was given." +msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." -#: sequencer.c:490 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Lần chuyển giao %s không có cha mẹ %d" +msgid "commit %s does not have parent %d" +msgstr "lần chuyển giao %s không có cha mẹ %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 "" -"Luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần " +"luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần " "hòa trộn." -#. 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: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:511 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" -msgstr "Không thể lấy ghi chú lần chuyển giao cho %s" +msgid "cannot get commit message for %s" +msgstr "không thể lấy ghi chú lần chuyển giao cho %s" -#: sequencer.c:597 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "không thể hoàn nguyên %s… %s" -#: sequencer.c:598 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "không thể áp dụng miếng vá %s… %s" -#: sequencer.c:633 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:641 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:645 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:705 -msgid "Cannot revert during another revert." -msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác." - -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick." - -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "Không thể cherry-pick trong khi hoàn nguyên." - -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "" -"Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác." - -#: sequencer.c:732 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "Không phân tích được dòng %d." +msgid "invalid line %d: %.*s" +msgstr "dòng không hợp lệ %d: %.*s" -#: sequencer.c:737 -msgid "No commits parsed." -msgstr "Không có lần chuyển giao nào được phân tích." +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "không có lần chuyển giao nào được phân tích." -#: sequencer.c:749 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "Không thể mở %s" +msgid "could not read '%s'." +msgstr "không thể đọc “%s”." -#: sequencer.c:753 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "Không thể đọc %s." +msgid "unusable instruction sheet: '%s'" +msgstr "bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "Bảng chỉ thị không thể dùng được: %s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "không thể cherry-pick trong khi hoàn nguyên." -#: sequencer.c:790 +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick." + +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" -msgstr "Khóa không đúng: %s" +msgid "invalid key: %s" +msgstr "khóa không đúng: %s" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "Giá trị không hợp lệ %s: %s" +msgid "invalid value for %s: %s" +msgstr "giá trị cho %s không hợp lệ: %s" -#: sequencer.c:803 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "Bảng tùy chọn dị hình: %s" +msgid "malformed options sheet: '%s'" +msgstr "bảng tùy chọn dị hình: “%s”" -#: sequencer.c:822 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện" -#: sequencer.c:823 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "Không thể tạo thư mục xếp dãy %s" +msgid "could not create sequencer directory '%s'" +msgstr "không thể tạo thư mục xếp dãy “%s”" + +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "không thể khóa HEAD" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay hoàn nguyên trong tiến trình" -#: sequencer.c:864 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:866 sequencer.c:900 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: 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 "không mở được “%s”" -#: sequencer.c:888 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "không thể đọc %s: %s" +msgid "cannot read '%s': %s" +msgstr "không thể đọc “%s”: %s" -#: sequencer.c:889 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:895 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "Không thể định dạng “%s”." - -#: sequencer.c:1066 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:1069 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "Không thể hoàn nguyên một lần chuyển giao khởi tạo" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo" #: setup.c:160 #, c-format @@ -1968,11 +2912,6 @@ msgstr "" "Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n" "“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "gặp lỗi khi đọc %s" - #: setup.c:468 #, c-format msgid "Expected git repo version <= %d, found %d" @@ -2019,22 +2958,56 @@ msgstr "" "Gặp vấn đề với gía trị chế độ tập tin core.sharedRepository (0%.3o).\n" "người sở hữu tập tin phải luôn có quyền đọc và ghi." -#: sha1_file.c:1046 +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "đường dẫn “%s” không tồn tại" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "kho tham chiếu “%s” là nông" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "kho tham chiếu “%s” bị cấy ghép" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)" -#: sha1_file.c:2434 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)" -#: sha1_file.c:2438 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "tóm lược SHA1 %s chưa rõ ràng" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "Các ứng cử là:" + +#: 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" @@ -2083,7 +3056,7 @@ msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s" msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "không cho phép giá trị âm ở submodule.fetchJobs" @@ -2092,56 +3065,56 @@ msgstr "không cho phép giá trị âm ở submodule.fetchJobs" msgid "invalid value for %s" msgstr "giá trị cho %s không hợp lệ" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "chạy lệnh kéo theo “%s” gặp lỗi" -#: 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 "không hiểu giá trị “%s” cho khóa “%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 "nhiều hơn một %s" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "không đọc được tập tin đầu vào “%s”" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "không thể lấy thông tin thống kê về %s" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "\"%s\" không phải là tập tin bình thường" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "tập tin %s người dùng không thể ghi được" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "không thể tạo tập tin tạm thời" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "không thể đổi tên tập tin tạm thời thành %s" @@ -2156,7 +3129,7 @@ msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” c msgid "transport: invalid depth option '%s'" msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ" -#: transport.c:771 +#: transport.c:817 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -2165,7 +3138,7 @@ msgstr "" "Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n" "có thể được tìm thấy trên mọi máy phục vụ:\n" -#: transport.c:775 +#: transport.c:821 #, c-format msgid "" "\n" @@ -2192,15 +3165,31 @@ msgstr "" "để đẩy chúng lên máy phục vụ.\n" "\n" -#: transport.c:783 +#: transport.c:829 msgid "Aborting." msgstr "Bãi bỏ." -#: transport-helper.c:1041 +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "Không thể đọc tham chiếu %s" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "đối tượng cây quá ngắn" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "chế độ dị hình trong đề mục cây" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "tên tập tin trống rỗng trong mục tin cây" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "tập tin cây quá ngắn" + #: unpack-trees.c:64 #, c-format msgid "" @@ -2410,7 +3399,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 "" @@ -2421,7 +3410,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 "" @@ -2477,14 +3466,14 @@ msgstr "gặp lỗi khi đọc “%s”" msgid "could not open '%s' for reading and writing" msgstr "không thể mở “%s” để đọc và ghi" -#: 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 "không thể mở “%s” để ghi" -#: 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 "không thể mở “%s” để đọc" @@ -2508,150 +3497,150 @@ msgstr "không thể ghi vào %s" msgid "could not close %s" msgstr "không thể đóng %s" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "Những đường dẫn chưa được hòa trộn:" -#: 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 " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)" -#: 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 " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: 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 "" " (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là " "cần được giải quyết)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:198 wt-status.c:882 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:216 wt-status.c:891 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục " "làm việc)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa " "chữa trong mô-đun-con)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "bị xóa bởi cả hai:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "được thêm vào bởi chúng ta:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "bị xóa đi bởi họ:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "được thêm vào bởi họ:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "bị xóa bởi chúng ta:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "được thêm vào bởi cả hai:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "bị sửa bởi cả hai:" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "tập tin mới:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "đã chép:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "đã xóa:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "đã sửa:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "đã đổi tên:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "đổi-kiểu:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "không hiểu:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "chưa hòa trộn:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "lần chuyển giao mới, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "nội dung bị sửa đổi, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:756 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: wt-status.c:758 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:839 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2659,105 +3648,105 @@ msgstr "" "Không động đến đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:950 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:953 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:955 +#: wt-status.c:1018 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)" -#: wt-status.c:960 +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:963 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:973 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:976 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:980 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:982 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:984 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:1109 +#: wt-status.c:1172 msgid "No commands done." msgstr "Không thực hiện lệnh nào." -#: 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] "Lệnh thực hiện cuối (%d lệnh được thực thi):" -#: wt-status.c:1123 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " (xem thêm trong %s)" -#: wt-status.c:1128 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "Không có lệnh nào còn lại." -#: 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] "Lệnh cần làm kế tiếp (%d lệnh còn lại):" -#: wt-status.c:1139 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)" -#: wt-status.c:1152 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1157 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)." -#: wt-status.c:1171 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")" -#: wt-status.c:1173 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1175 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1181 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"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'." @@ -2765,130 +3754,130 @@ msgstr "" "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi " "đang “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1190 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:1193 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"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 "" "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang " "rebase nhánh “%s” trên “%s”." -#: wt-status.c:1202 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:1205 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:1207 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài " "lòng về những thay đổi của mình)" -#: wt-status.c:1217 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1222 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1225 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"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 " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1236 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”." -#: wt-status.c:1241 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1244 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1246 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)" -#: wt-status.c:1257 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1261 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1264 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1464 +#: wt-status.c:1524 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1470 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên " -#: wt-status.c:1472 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1477 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1479 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1482 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1500 +#: wt-status.c:1560 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1514 +#: wt-status.c:1574 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1516 +#: wt-status.c:1576 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1520 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2900,32 +3889,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1526 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1528 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1534 +#: wt-status.c:1594 msgid "No changes" msgstr "Không có thay đổi nào" -#: 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 "" "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc " "\"git commit -a\")\n" -#: wt-status.c:1542 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1545 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2934,57 +3923,74 @@ msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1548 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện\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 "" "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để " "đưa vào theo dõi)\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 "không có gì để chuyển giao\n" -#: wt-status.c:1557 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n" -#: wt-status.c:1561 +#: wt-status.c:1621 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1668 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "Lần chuyển giao khởi tạo trên " -#: wt-status.c:1672 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1701 +#: wt-status.c:1761 msgid "gone" msgstr "đã ra đi" -#: wt-status.c:1703 wt-status.c:1711 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1706 wt-status.c:1709 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "phía trước " -#: 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 "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "" +"thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "" +"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" @@ -2993,279 +3999,264 @@ msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…" -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:71 builtin/commit.c:281 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" -#: builtin/add.c:81 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "gỡ bỏ “%s”\n" -#: builtin/add.c:136 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "" "Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:" -#: 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 "Không thể đọc bảng mục lục" -#: builtin/add.c:207 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:211 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:214 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "gặp lỗi khi sửa miếng vá" -#: builtin/add.c:217 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/add.c:219 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Nên bỏ qua." -#: builtin/add.c:224 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "Không thể áp dụng miếng vá “%s”" -#: builtin/add.c:234 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\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 "chạy thử" -#: 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 "chi tiết" - -#: builtin/add.c:256 +#: builtin/add.c:269 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: 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 "chọn “hunks” theo kiểu tương tác" -#: builtin/add.c:258 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:259 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:260 +#: builtin/add.c:273 msgid "update tracked files" msgstr "cập nhật các tập tin được theo dõi" -#: builtin/add.c:261 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:262 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" -#: builtin/add.c:265 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)" -#: builtin/add.c:267 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:268 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:269 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: 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 "ghi đè lên bít thi hành của các tập tin được liệt kê" -#: builtin/add.c:292 +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" -#: builtin/add.c:300 +#: builtin/add.c:312 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:336 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:343 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:352 +#: builtin/add.c:359 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod tham số “%s” phải hoặc là -x hay +x" -#: builtin/add.c:367 +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:368 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ ý bạn là “git add .” phải không?\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 "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "Không thể ghi tập tin lưu bảng mục lục mới" - -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "Không thể đọc “%s”." - -#: builtin/am.c:426 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "không thể phân tích cú pháp văn lệnh tác giả" -#: builtin/am.c:503 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "“%s” bị xóa bởi móc applypatch-msg" -#: builtin/am.c:544 builtin/notes.c:301 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng đầu vào dị hình: “%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 "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/am.c:607 +#: builtin/am.c:595 msgid "fseek failed" msgstr "fseek gặp lỗi" -#: builtin/am.c:787 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "không thể phân tích cú pháp “%s”" -#: builtin/am.c:852 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: builtin/am.c:899 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "dấu thời gian không hợp lệ" -#: builtin/am.c:902 builtin/am.c:910 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "dòng Ngày tháng không hợp lệ" -#: builtin/am.c:907 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "độ lệch múi giờ không hợp lệ" -#: builtin/am.c:996 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: 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 "tạo thư mục \"%s\" gặp lỗi" -#: builtin/am.c:1005 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "Gặp lỗi khi chia nhỏ các miếng vá." -#: builtin/am.c:1137 builtin/commit.c:366 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "không thể ghi tập tin lưu mục lục" -#: builtin/am.c:1188 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%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 "" "Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế." -#: builtin/am.c:1190 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "Miếng vá trống rỗng. Quá trình chia nhỏ miếng vá có lỗi?" -#: builtin/am.c:1402 builtin/log.c:1543 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "dòng thụt lề không hợp lệ: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "không thể phân tích lần chuyển giao “%s”" -#: builtin/am.c:1602 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." -#: builtin/am.c:1604 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…" -#: 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." @@ -3273,38 +4264,38 @@ msgstr "" "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." -#: builtin/am.c:1629 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…" -#: builtin/am.c:1654 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: 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 "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/am.c:1686 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: 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 "gặp lỗi khi ghi đối tượng chuyển giao" -#: 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 "không thể phục hồi: %s không tồn tại." -#: builtin/am.c:1751 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối" -#: builtin/am.c:1756 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" @@ -3312,37 +4303,37 @@ msgstr "Thân của lần chuyển giao là:" #. 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 "" "Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất " "cả [a]: " -#: builtin/am.c:1816 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)" -#: builtin/am.c:1853 builtin/am.c:1925 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "Áp dụng: %.*s" -#: builtin/am.c:1869 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: builtin/am.c:1877 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gặp lỗi khi vá tại %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 "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %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" @@ -3353,7 +4344,7 @@ msgstr "" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." -#: 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'?" @@ -3361,17 +4352,17 @@ msgstr "" "Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình.\n" "Bạn đã quên sử dụng lệnh “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 "không thể phân tích đối tượng “%s”." -#: builtin/am.c:2095 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "gặp lỗi khi dọn bảng mục lục" -#: 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" @@ -3379,155 +4370,134 @@ msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" -#: builtin/am.c:2192 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giá trị không hợp lệ cho --patch-format: %s" -#: builtin/am.c:2225 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2226 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)" -#: builtin/am.c:2232 +#: builtin/am.c:2240 msgid "run interactively" msgstr "chạy kiểu tương tác" -#: builtin/am.c:2234 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "tùy chọn lịch sử -- không-toán-tử" -#: builtin/am.c:2236 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần" -#: 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 "im lặng" -#: builtin/am.c:2239 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao" -#: builtin/am.c:2242 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "chuyển mã thành utf8 (mặc định)" -#: builtin/am.c:2244 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "chuyển cờ -k cho git-mailinfo" -#: builtin/am.c:2246 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "chuyển cờ -b cho git-mailinfo" -#: builtin/am.c:2248 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "chuyển cờ -m cho git-mailinfo" -#: builtin/am.c:2250 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox" -#: builtin/am.c:2253 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr" -#: builtin/am.c:2256 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "cắt mọi thứ trước dòng scissors" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "hành động" - -#: 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 "chuyển nó qua git-apply" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "gốc" - -#: 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 "đường-dẫn" - -#: 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 "số" - -#: 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 "định dạng" -#: builtin/am.c:2282 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "định dạng (các) miếng vá theo" -#: builtin/am.c:2288 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng" -#: builtin/am.c:2290 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột" -#: builtin/am.c:2293 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "đồng nghĩa với --continue" -#: builtin/am.c:2296 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "bỏ qua miếng vá hiện hành" -#: builtin/am.c:2299 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá." -#: builtin/am.c:2303 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "nói dối về ngày chuyển giao" -#: builtin/am.c:2305 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "dùng dấu thời gian hiện tại cho ngày tác giả" -#: 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 "mã-số-khóa" -#: builtin/am.c:2308 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "lần chuyển giao ký-GPG" -#: builtin/am.c:2311 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(dùng nội bộ cho 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." @@ -3535,16 +4505,16 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: builtin/am.c:2333 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/am.c:2348 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra." -#: builtin/am.c:2372 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3553,490 +4523,14 @@ msgstr "" "Tìm thấy thư mục lạc %s.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: builtin/am.c:2378 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." -#: builtin/apply.c:122 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<các-tùy-chọn>] [<miếng-vá>…]" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" - -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" - -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "" -"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " -"%s" - -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" - -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" - -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" - -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" - -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" - -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" - -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "chi tiết: dòng không cần: %.*s" - -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %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] "" -"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " -"thành phần dẫn đầu tên của đường dẫn (dòng %d)" - -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "tập tin mới phụ thuộc vào nội dung cũ" - -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "tập tin đã xóa vẫn còn nội dung" - -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" -msgstr "miếng vá hỏng tại dòng %d" - -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" - -#: builtin/apply.c:1812 -#, c-format -msgid "deleted file %s still has contents" -msgstr "tập tin đã xóa %s vẫn còn nội dung" - -#: builtin/apply.c:1815 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" - -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" - -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" - -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "vá chỉ với “rác” tại dòng %d" - -#: builtin/apply.c:2244 -#, c-format -msgid "unable to read symlink %s" -msgstr "không thể đọc liên kết mềm %s" - -#: builtin/apply.c:2248 -#, c-format -msgid "unable to open or read %s" -msgstr "không thể mở hay đọc %s" - -#: builtin/apply.c:2901 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "sai khởi đầu dòng: “%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] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." - -#: builtin/apply.c:3032 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" - -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"trong khi đang tìm kiếm cho:\n" -"%.*s" - -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" - -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" - -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " -"%s)" - -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "gặp lỗi khi vá: %s:%ld" - -#: builtin/apply.c:3314 -#, c-format -msgid "cannot checkout %s" -msgstr "không thể lấy ra %s" - -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" - -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" - -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: không tồn tại trong bảng mục lục" - -#: 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: không khớp trong mục lục" - -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "loại bỏ miếng vá để lại nội dung tập tin" - -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s: sai kiểu" - -#: builtin/apply.c:3671 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s có kiểu %o, cần %o" - -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" -msgstr "đường dẫn không hợp lệ “%s”" - -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: đã có từ trước trong bảng mục lục" - -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: đã sẵn có trong thư mục đang làm việc" - -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" - -#: builtin/apply.c:3907 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" - -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" - -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: miếng vá không được áp dụng" - -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "Đang kiểm tra miếng vá %s…" - -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" - -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "không thể gỡ bỏ %s từ mục lục" - -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "miếng vá sai hỏng cho mô-đun-con %s" - -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo" - -#: builtin/apply.c:4224 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" - -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "không thể thêm mục nhớ đệm cho %s" - -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "đang đóng tập tin “%s”" - -#: builtin/apply.c:4313 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "không thể ghi vào tập tin “%s” chế độ %o" - -#: builtin/apply.c:4403 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." - -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "lỗi nội bộ" - -#: builtin/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" - -#: builtin/apply.c:4424 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" - -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "không thể mở %s: %s" - -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "Khối nhớ #%d được áp dụng gọn gàng." - -#: builtin/apply.c:4448 -#, c-format -msgid "Rejected hunk #%d." -msgstr "đoạn dữ liệu #%d bị từ chối." - -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." -msgstr "bỏ qua đường dẫn “%s”." - -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "không thừa nhận đầu vào" - -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "không thể đọc tập tin lưu bảng mục lục" - -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "--3way ở ngoài một kho chứa" - -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "--index ở ngoài một kho chứa" - -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "--cached ở ngoài một kho chứa" - -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "không thể mở miếng vá “%s”" - -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" - -#: 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 dòng thêm khoảng trắng lỗi." - -#: builtin/apply.c:4800 -msgid "don't apply changes matching the given path" -msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" - -#: builtin/apply.c:4803 -msgid "apply changes matching the given path" -msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" - -#: builtin/apply.c:4806 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" - -#: builtin/apply.c:4809 -msgid "ignore additions made by the patch" -msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" - -#: builtin/apply.c:4811 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "" -"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" - -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "" -"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" - -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" - -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" - -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" - -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" - -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" - -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "" -"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" - -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" - -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" -msgstr "" -"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" - -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" -msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" - -#: builtin/apply.c:4836 -msgid "ensure at least <n> lines of context match" -msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" - -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" - -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" - -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "áp dụng miếng vá theo chiều ngược" - -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "đừng hy vọng có ít nhất một dòng nội dung" - -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" - -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "cho phép chồng khối nhớ" - -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "" -"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" - -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" - -#: builtin/apply.c:4862 -msgid "prepend <root> to all filenames" -msgstr "treo thêm <root> vào tất cả các tên tập tin" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -4097,114 +4591,164 @@ msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)" msgid "Blaming lines" msgstr "Các dòng blame" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "Ép buộc báo cáo tiến triển công việc" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "Dùng một phỏng đoán dựa trên thụt lề thử nghiệm để tăng cường các diff" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "" +"Dùng một phỏng đoán dựa trên dòng trắng thử nghiệm để tăng cường các diff" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" -#: 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 "Xử lý chỉ dòng vùng n,m, tính từ 1" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"--progress không được dùng cùng với --incremental hay các định dạng porcelain" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trước" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "tùy chọn--contents và --reverse không được trộn vào nhau." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-" +"tiên" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "không có đường dẫn %s trong “%s”" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "không thể đọc blob %s cho đường dẫn “%s”" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "tập tin %s chỉ có %lu dòng" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--merged | --no-merged]" @@ -4452,6 +4996,10 @@ msgstr "thượng nguồn" msgid "change the upstream info" msgstr "thay đổi thông tin thượng nguồn" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "Bỏ đặt thông tin thượng nguồn" + #: builtin/branch.c:661 msgid "use colored output" msgstr "tô màu kết xuất" @@ -4524,8 +5072,8 @@ msgstr "khóa" msgid "field name to sort on" msgstr "tên trường cần sắp xếp" -#: 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 "đối tượng" @@ -4538,7 +5086,7 @@ msgstr "chỉ hiển thị các nhánh của đối tượng" msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" @@ -4650,64 +5198,80 @@ msgstr "Cần một kho chứa để có thể tạo một bundle." msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/cat-file.c:443 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<type>|--textconv) <object>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<kiểu>|--textconv) <đối_tượng>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>" -#: 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 "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng" + +#: 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 "dùng một đường dẫn rõ ràng cho --textconv/--filters" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "đệm kết xuất --batch" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "hiển thị mọi đối tượng với --batch hay --batch-check" @@ -4727,7 +5291,7 @@ msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin" msgid "use .gitattributes only from the index" msgstr "chỉ dùng .gitattributes từ bảng mục lục" -#: 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 "đọc tên tập tin từ đầu vào tiêu chuẩn" @@ -4735,7 +5299,7 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" -#: 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 "chặn các báo cáo tiến trình hoạt động" @@ -4826,9 +5390,9 @@ msgid "write the content to temporary files" msgstr "ghi nội dung vào tập tin tạm" #: 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 "chuỗi" @@ -4900,54 +5464,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Không thể thực hiện reflog cho “%s”: %s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:668 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và đặt lại nhánh “%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 "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:683 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:734 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:740 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4966,7 +5530,7 @@ msgstr[0] "" "\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" @@ -4987,152 +5551,152 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:795 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" -#: builtin/checkout.c:799 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: 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 "Bạn tại nhánh mà nó chưa hề được sinh ra" -#: builtin/checkout.c:971 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." -#: builtin/checkout.c:1011 builtin/worktree.c:214 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1040 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây:%s" -#: builtin/checkout.c:1079 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: 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” không thể được sử dụng với các nhánh chuyển" -#: 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” không thể được dùng với “%s”" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”" -#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1144 builtin/worktree.c:328 +#: builtin/checkout.c:1143 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1154 builtin/merge.c:231 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: 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 "kiểu" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout <no-such-branch>'" msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\"" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho" -#: 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 "ép buộc báo cáo tiến triển công việc" -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1253 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5142,12 +5706,12 @@ msgstr "" "Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần " "chuyển giao?" -#: 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 không nhận một đối số đường dẫn “%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." @@ -5298,8 +5862,8 @@ msgstr "dọn bằng kiểu tương tác" msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: 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 "mẫu" @@ -5339,112 +5903,130 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: 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 "tạo kho thuần" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (ý là kho thuần)" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "số lượng mô-đun-con được nhân bản đồng thời" -#: builtin/clone.c:80 builtin/init-db.c:473 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "thư-mục-mẫu" -#: 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 "thư mục mà tại đó các mẫu sẽ được dùng" -#: 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 "kho tham chiếu" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" -#: 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 "tên" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: 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 "độ-sâu" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "thời-gian" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "điểm xét duyệt" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "làm sâu hơn lịch sử của bản sao shallow bằng điểm xét duyệt loại trừ" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)" -#: 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 "không dùng chung thư mục dành riêng cho git và thư mục làm việc" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "khóa=giá_trị" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "đặt cấu hình bên trong một kho chứa mới" -#: 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 "chỉ dùng địa chỉ 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 "chỉ dùng địa chỉ 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" @@ -5452,57 +6034,42 @@ msgstr "" "Không đoán được thư mục tên là gì.\n" "Vui lòng chỉ định tên một thư mục trên dòng lệnh" -#: builtin/clone.c:307 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ." - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "kho tham chiếu “%s” là nông" - -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "kho tham chiếu “%s” bị cấy ghép" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n" -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "%s có tồn tại nhưng lại không phải là một thư mục" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "gặp lỗi khi sao chép tập tin và “%s”" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "hoàn tất.\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" @@ -5512,121 +6079,141 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử lấy ra với lệnh “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 "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "không thể cập nhật %s" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "không thể ghi các tham số vào tập tin cấu hình" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "không thể đóng gói để dọn dẹp" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" -#: builtin/clone.c:863 builtin/receive-pack.c:1855 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:900 builtin/fetch.c:1293 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: 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 "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "không thể tạo cây thư mục làm việc dir “%s”" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”…\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:997 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"nhân bản --recursive không tương thích với cả hai --reference và --reference-" +"if-able" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:1000 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " +"thế." + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " +"thế." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết làm cách nào để nhân bản (clone) %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 "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -5777,68 +6364,68 @@ msgstr "" "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n" "những lần chuyển giao còn lại.\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "gặp lỗi khi thêm bằng cách tương" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "không thể cập nhật bảng mục lục tạm thời" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm" -#: 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 "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %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" @@ -5846,38 +6433,38 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: 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 "không thể tìm kiếm commit (lần chuyển giao) %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 "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5892,7 +6479,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5907,7 +6494,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5918,7 +6505,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5930,157 +6517,161 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: 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 "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -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” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " "tác giả nào sẵn có" -#: 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 "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" "Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup" -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -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 chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "Giỏi… “tu bổ” cái cuối với bảng mục lục bẩn." -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; coi " "là --only những đường dẫn" -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Các đường dẫn với tùy chọn -a không hợp lý." -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "phiên bản" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng 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 "chế độ" -#: 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 "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "khi" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6088,205 +6679,205 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "" "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1596 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1598 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: 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 "chú thích" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "commit message" msgstr "chú thích của lần chuyển giao" -#: 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 "lần_chuyển_giao" -#: builtin/commit.c:1600 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -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 "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "mặc định" -#: 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 "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: 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 "ký lần chuyển giao dùng GPG" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "vòng qua móc (hook) pre-commit và commit-msg" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) của llần chuyển giao: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích " "(message).\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\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" @@ -6455,11 +7046,20 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "không thể tạo tập tin cấu hình “%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 "" +"không thể ghi đè nhiều giá trị với một giá trị đơn\n" +" Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %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 "hiển thị kích cỡ theo định dạng dành cho người đọc" @@ -6579,7 +7179,7 @@ msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" msgid "only consider tags matching <pattern>" msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: 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 "hiển thị đối tượng chuyển giao vắn tắt như là fallback" @@ -6613,21 +7213,21 @@ msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm" msgid "invalid option: %s" msgstr "tùy chọn không hợp lệ: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ “%s”." @@ -6700,163 +7300,167 @@ msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các-tùy-chọn>]" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: 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 "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: 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 "đường dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "ép buộc ghi đè lên nhánh nội bộ" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "số lượng mô-đun-con được lấy đồng thời" -#: 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 "" "cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải về" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu 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 "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "tmục" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "chế độ mặc định cho đệ qui" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "chấp nhận tham chiếu cập nhật .git/shallow" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "không thể fetch (lấy) về nhánh hiện hành" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: 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 "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "không-phải-chuyển-tiếp-nhanh" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6865,57 +7469,57 @@ msgstr "" "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho " "trần (bare)" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "Không biết làm cách nào để lấy về từ %s" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\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 "không thể “%s” về" -#: 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." @@ -6923,32 +7527,40 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" @@ -6959,23 +7571,23 @@ msgstr "" "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-" "tin>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "bí danh cho --log (không được dùng)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "văn bản" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "dùng <văn bản thường> để bắt đầu ghi chú" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" @@ -7091,7 +7703,7 @@ msgstr "hiển thị quá trình" msgid "show verbose names for reachable objects" msgstr "hiển thị tên chi tiết cho các đối tượng đọc được" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" @@ -7186,227 +7798,222 @@ msgstr "grep: gặp lỗi tạo tuyến (thread): %s" msgid "invalid number of threads specified (%d) for %s" msgstr "số tuyến đã cho không hợp lệ (%d) cho %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 "không thể đọc cây (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "không mở được “%s”" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "tìm trong nội dung không được quản lý bởi git" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "không khớp mẫu trong các tập tin nhị phân" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "sử dụng biểu thức chính quy tương thích Perl" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "" "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "hiển thị dòng vói tên hàm trước các lần khớp" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "hiển thị các tập tin khớp trong trang giấy" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "chưa chỉ ra mẫu." -#: builtin/grep.c:845 builtin/index-pack.c:1479 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached hay --untracked không được sử dụng với --no-index." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index hay --untracked không được sử dụng cùng với các tùy chọn liên " "quan đến revs." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -7422,83 +8029,87 @@ 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 "kiểu" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "kiểu đối tượng" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "ghi đối tượng vào dữ liệu đối tượng" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "lưu các tập tin mà nó không có các bộ lọc" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng hỏng để mà gỡ lỗi Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "xử lý tập tin như là nó đang ở thư mục này" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "hướng dẫn loại trừ" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "hiển thị danh sách các hướng dẫn hữu dụng" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "hiển thị trang man" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "hiện trang 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] [<lệnh>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "không nhận ra định dạng trợ giúp “%s”" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Gặp lỗi khi khởi chạy emacsclient." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "phiên bản của emacsclient “%d” quá cũ (< 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 "gặp lỗi khi thực thi “%s”" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7507,7 +8118,7 @@ msgstr "" "“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7516,295 +8127,299 @@ msgstr "" "“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" "Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:401 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn" -#: builtin/help.c:402 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "Mỗi ngày học 20 lệnh Git hay hơn" -#: builtin/help.c:403 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "Thuật ngữ chuyên môn Git" -#: builtin/help.c:404 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "Chỉ định các tập tin không cần theo dõi" -#: builtin/help.c:405 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "Định nghĩa thuộc tính mô-đun-con" -#: builtin/help.c:406 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "Chỉ định điểm xét duyệt và vùng cho Git" -#: builtin/help.c:407 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)" -#: builtin/help.c:408 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git." -#: builtin/help.c:420 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "Các chỉ dẫn chung về cách dùng Git là:\n" -#: builtin/help.c:441 builtin/help.c:458 -#, c-format -msgid "usage: %s%s" -msgstr "cách dùng: %s%s" - -#: builtin/help.c:474 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "“git %s” được đặt bí danh thành “%s”" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "cách dùng: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "kiểu đối tượng không khớp tại %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "Không thể lấy về đối tượng cần %s" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %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] "không thể điền thêm vào %d byte" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "gặp kết thúc tập tin EOF quá sớm" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "lỗi đọc ở đầu vào" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "gói đã vượt quá cỡ tối đa được phép" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "không thể mở packfile “%s”" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "chữ ký cho gói không khớp" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "không hỗ trợ phiên bản gói %<PRIu32>" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "không thể chạy hàm pread cho tập tin gói" -#: 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] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 -#: builtin/index-pack.c:808 builtin/index-pack.c:817 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %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 "không thể đọc %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: 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 "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: 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] "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)" -#: 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] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai 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 "không hỗ trợ đa tuyến, bỏ qua %s" @@ -7842,95 +8457,95 @@ msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằn msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "không thể lấy thông tin thống kê về mẫu “%s”" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "không thể opendir() “%s”" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "không thể readlink “%s”" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "không thể tạo liên kết mềm (symlink) “%s” “%s”" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "không thể sao chép “%s” sang “%s”" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "đang lờ đi mẫu “%s”" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "các mẫu không được tìm thấy %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "không sao chép các mẫu từ “%s”: %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s đã có từ trước rồi" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "không thể xử lý (handle) tập tin kiểu %d" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "không di chuyển được %s vào %s" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s đã có từ trước rồi" + +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git chia sẻ sẵn có trong %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 "Đã khởi tạo lại kho Git sẵn có trong %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 "Đã khởi tạo lại kho Git chia sẻ trống rỗng sẵn có trong %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 "Đã khởi tạo lại kho Git trống rỗng sẵn có trong %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>]" @@ -7938,25 +8553,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "các quyền" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" -#: 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 "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %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-" @@ -7965,7 +8580,7 @@ msgstr "" "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-" "dir=<thư-mục>)" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" @@ -8076,37 +8691,34 @@ msgstr "Không phải là một vùng." msgid "Cover letter needs email format" msgstr "“Cover letter” cần cho định dạng thư" -#: builtin/log.c:1064 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: 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 "Không hiểu lần chuyển giao %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 "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "Không tìm thấy nền hòa trộn chính xác." -#: 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" @@ -8117,210 +8729,214 @@ msgstr "" "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n" "\"--base=<base-commit-id>\" một cách thủ công." -#: builtin/log.c:1283 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "Gặp lỗi khi tìm nền hòa trộn chính xác." -#: builtin/log.c:1294 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" -#: builtin/log.c:1298 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" -#: builtin/log.c:1347 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "không thể lấy mã miếng vá" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: 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 "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "Dùng [RFC VÁ] thay cho [VÁ]" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "xuất mọi mã băm all-zero trong phần đầu From" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1443 builtin/log.c:1445 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1452 builtin/log.c:1455 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "lần_chuyển_giao_nền" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix và -k xung khắc nhau." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc và -k xung khắc nhau." -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "Gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -8328,102 +8944,106 @@ msgstr "" "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một " "cách thủ công.\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "nhận dạng các trạng thái tập tin với thẻ" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " "thay đổi)" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "hiển thị các tập tin đã xóa trong kết xuất" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "hiển thị các tập tin khác trong kết xuất" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "chỉ hiển thị tên của các thư mục “khác”" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "hiển thị kết thúc dòng của các tập tin" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "không hiển thị thư mục rỗng" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "bỏ qua những tập tin khớp với một mẫu" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được đọc từ <tập tin>" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "đệ quy xuyên qua mô-đun con" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" @@ -8540,31 +9160,31 @@ msgstr "Các chiến lược sẵn sàng là:" msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" -#: 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 "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" -#: 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 "hiển thị thống kê khác biệt tại cuối của hòa trộn" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --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 "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn" -#: 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 "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao" @@ -8572,28 +9192,28 @@ msgstr "sửa chú thích trước khi chuyển giao" msgid "allow fast-forward (default)" msgstr "cho phép chuyển-tiếp-nhanh (mặc định)" -#: 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 "bỏ qua nếu chuyển-tiếp-nhanh không thể được" -#: 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 "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#: 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 "chiến lược" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" @@ -8607,7 +9227,7 @@ msgstr "" msgid "abort the current in-progress merge" msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:227 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "cho phép hòa trộn lịch sử không liên quan" @@ -8834,55 +9454,55 @@ msgstr "từ chối hòa trộn lịch sử không liên quan" msgid "Already up-to-date." msgstr "Đã cập nhật rồi." -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "Đã cập nhật rồi. Yeeah!" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua." -#: 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 "Đang tua lại cây thành thời xa xưa…\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8909,23 +9529,23 @@ msgstr "git merge-base --is-ancestor <commit> <lần_chuyển_giao>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <tham-chiếu> [<lần_chuyển_giao>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "xuất ra tất cả các ông bà, tổ tiên chung" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "tìm tổ tiên của hòa trộn n-way đơn" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "liệt kê các “rev” mà nó không thể đọc được từ cái khác" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "là cha mẹ đầu tiên của cái khác?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.chiếu>" @@ -8969,6 +9589,36 @@ msgstr "không cảnh báo về các xung đột xảy ra" msgid "set labels for file1/orig-file/file2" msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "không hiểu tùy chọn %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "không thể phân tích đối tượng “%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] "không thể xử lý nhiều hơn %d nền. Bỏ qua %s" + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "không cầm nắm gì ngoài hai head hòa trộn" + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "không thể phân giải tham chiếu %s" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Đang hòa trộn %s với %s\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9078,44 +9728,44 @@ msgstr "Đổi tên %s thành %s\n" msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<các-tùy-chọn>] <commit>…" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<các-tùy-chọn>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<các-tùy-chọn>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "chỉ hiển thị tên (không SHA-1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "" "liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "đọc từ đầu vào tiêu chuẩn" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)" @@ -9248,9 +9898,9 @@ msgid "failed to finish 'show' for object '%s'" msgstr "gặp lỗi khi hoàn thành “show” cho đối tượng “%s”" #: builtin/notes.c:194 -msgid "Please supply the note contents using either -m or -F option" +msgid "please supply the note contents using either -m or -F option" msgstr "" -"Xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" +"xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" #: builtin/notes.c:203 msgid "unable to write note object" @@ -9258,8 +9908,8 @@ msgstr "không thể ghi đối tượng ghi chú (note)" #: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" -msgstr "Nội dung ghi chú còn lại %s" +msgid "the note contents have been left in %s" +msgstr "nội dung ghi chú còn lại %s" #: builtin/notes.c:233 builtin/tag.c:439 #, c-format @@ -9271,52 +9921,76 @@ msgstr "không thể đọc “%s”" msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%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 "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." -msgstr "Gặp lỗi khi đọc đối tượng “%s”." +msgid "failed to read object '%s'." +msgstr "gặp lỗi khi đọc đối tượng “%s”." #: 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 "không thể đọc dữ liệu ghi chú từ đối tượng không-blob “%s”." -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "dòng đầu vào dị hình: “%s”." + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s” sang “%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 "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)" + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "quá nhiều đối số" -#: 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 "không tìm thấy ghi chú cho đối tượng %s." -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "nội dung ghi chú (note) nằm trong một chuỗi" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "nội dung ghi chú (note) nằm trong một tập tin" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "cho lưu trữ ghi chú trống rỗng" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "thay thế ghi chú trước" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9325,29 +9999,29 @@ msgstr "" "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " "%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: 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 "Đang ghi đè lên ghi chú cũ cho đối tượng %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 "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "quá ít đối số" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9356,12 +10030,12 @@ msgstr "" "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " "tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "Thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép." +msgid "missing notes on source object %s. Cannot copy." +msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép." -#: 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" @@ -9370,20 +10044,52 @@ msgstr "" "Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n" "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "gặp lỗi khi gỡ bỏ cây làm việc “git notes merge”" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "không hiểu chiến lược hòa trộn ghi chú %s" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "Tùy chọn chung" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "Tùy chọn về hòa trộn" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9391,48 +10097,48 @@ msgstr "" "phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "Chuyển giao các note chưa được hòa trộn" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "" "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " "giao" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "bỏ qua hòa trộn các ghi chú (note)" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" -msgstr "Bạn phải chỉ định tham chiếu ghi chú để hòa trộn" +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" +msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn" -#: builtin/notes.c:821 +#: builtin/notes.c:823 #, c-format -msgid "Unknown -s/--strategy: %s" -msgstr "Không hiểu -s/--strategy: %s" +msgid "unknown -s/--strategy: %s" +msgstr "không hiểu -s/--strategy: %s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "Các ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s" +msgid "a notes merge into %s is already in-progress at %s" +msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" -msgstr "Gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)" +msgid "failed to store link to current notes ref (%s)" +msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%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 " @@ -9443,227 +10149,223 @@ msgstr "" "chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa " "trộn bằng “git notes merge --abort”.\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: 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 "không gỡ bỏ, chỉ hiển thị" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "báo cáo các đối tượng đã prune" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" -msgstr "Không hiểu câu lệnh con: %s" +msgid "unknown subcommand: %s" +msgstr "không hiểu câu lệnh con: %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 [các-tùy-chọn…] [< <danh-sách-tham-chiếu> | < " "<danh-sách-đối-tượng>]" -#: 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 [các-tùy-chọn…] <base-name> [< <danh-sách-ref> | < <danh-" "sách-đối-tượng>]" -#: 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 "lỗi giải nén (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được hỗ trợ %s" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "phiên bản[,offset]" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "kcíh thước tối đa cho tập tin gói được tạo" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "giới hạn cửa sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "pack mất các đối tượng không thể đọc được" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "thời-gian" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" -#: builtin/pack-objects.c:2704 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:2706 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy về nông (shallow)" -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" -#: builtin/pack-objects.c:2710 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:2712 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" -#: builtin/pack-objects.c:2714 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng" -#: builtin/pack-objects.c:2716 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "ghi một mục lục ánh xạ cùng với mục lục gói" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "Đang đếm các đối tượng" @@ -9703,54 +10405,45 @@ msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" msgid "cannot prune in a precious-objects repo" msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Giá trị không hợp lệ %s: %s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "Các tùy chọn liên quan đến hòa trộn" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn" -#: builtin/pull.c:147 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "cho phép chuyển-tiếp-nhanh" -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "Các tùy chọn liên quan đến lệnh lấy về" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "số lượng mô-đun-con được đẩy lên đồng thời" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Giá trị không hợp lệ cho pull.ff: %s" -#: builtin/pull.c:379 git-sh-setup.sh:226 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng." - -#: builtin/pull.c:385 git-sh-setup.sh:252 -msgid "Additionally, your index contains uncommitted changes." -msgstr "" -"Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." - -#: builtin/pull.c:387 git-sh-setup.sh:245 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9758,14 +10451,14 @@ msgstr "" "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa " "lấy về." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy " "về." -#: 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." @@ -9774,7 +10467,7 @@ msgstr "" "tự\n" "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9786,43 +10479,43 @@ msgstr "" "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n" "một nhánh trên dòng lệnh." -#: 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 "Hiện tại bạn chẳng ở nhánh nào cả." -#: 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 "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại." -#: 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 "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) để biết thêm chi tiết." -#: 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 "<máy chủ>" -#: 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 "<nhánh>" -#: 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 "Ở đây không có thông tin theo dõi cho nhánh hiện hành." -#: 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 "" "Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9831,21 +10524,29 @@ msgstr "" "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n" "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về." -#: builtin/pull.c:820 +#: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" msgstr "bỏ qua --verify-signatures khi rebase" -#: builtin/pull.c:867 +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase." -#: builtin/pull.c:875 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào " "bảng mục lục." -#: builtin/pull.c:903 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "pull với rebase" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9856,7 +10557,7 @@ msgstr "" "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n" "lần chuyển giaot %s." -#: builtin/pull.c:908 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9874,11 +10575,11 @@ msgstr "" "$ git reset --hard\n" "để khôi phục lại." -#: builtin/pull.c:923 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng." -#: builtin/pull.c:927 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh." @@ -10260,15 +10961,66 @@ msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" msgid "debug unpack-trees" msgstr "gỡ lỗi “unpack-trees”" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <thư-mục-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 "" +"Theo mặc định, việc cập nhật nhánh hiện tại không một kho không-thuần\n" +"bị từ chối, bởi vì nó sẽ làm cho chỉ mục và cây làm việc mâu thuẫn với\n" +"cái mà bạn đẩy lên, và sẽ yêu cầu lệnh “git reset --hard” để mà làm\n" +"cho cây làm việc khớp với HEAD.\n" +"\n" +"Bạn có thể đặt biến cấu hình “receive.denyCurrentBranch” thành\n" +"“ignore” hay “warn” trong kho máy chủ để cho phép đẩy lên nhánh\n" +"hiện tại của nó; tuy nhiên, không nên làm như thế trừ phi bạn\n" +"sắp đặt để cập nhật cây làm việc của nó tương ứng với cái mà bạn đẩy\n" +"lên theo cách nào đó.\n" +"\n" +"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n" +"biến cấu hình “receive.denyCurrentBranch” thành “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 "" +"Theo mặc định, việc cập xóa nhánh hiện tại bị từ chối, bởi vì\n" +"lệnh “git clone” tiếp theo sẽ không có tác dụng trong việc lấy\n" +"ra bất kỳ tập tin nào, dẫn đến hỗn loạn\n" +"\n" +"Bạn có thể đặt biến cấu hình “receive.denyDeleteCurrent” thành\n" +"“warn” hay “ignore” trong kho máy chủ để cho phép đẩy xóa nhánh\n" +"hiện tại của nó có hoặc không cảnh báo.\n" +"\n" +"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "im lặng" -#: builtin/receive-pack.c:1857 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "Bạn phải chỉ định thư mục." @@ -10595,7 +11347,7 @@ msgstr "* máy chủ %s" msgid " Fetch URL: %s" msgstr " URL để lấy về: %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 "(không có URL)" @@ -10631,7 +11383,7 @@ msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1179 builtin/remote.c:1206 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" @@ -10644,137 +11396,142 @@ msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “g msgid " Local refs will be mirrored by 'git push'" msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “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] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" -#: builtin/remote.c:1224 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" -#: builtin/remote.c:1226 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1241 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1243 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:" -#: builtin/remote.c:1253 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %s sẽ trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1282 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1292 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %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 " * [nên xén bớt] %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [đã bị xén] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: 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 "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1436 +#: builtin/remote.c:1435 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1443 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1460 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "truy vấn đẩy URL thay vì lấy" -#: builtin/remote.c:1462 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "trả về mọi URL" -#: builtin/remote.c:1490 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "không có URL nào được cấu hình cho nhánh “%s”" -#: builtin/remote.c:1516 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1518 +#: builtin/remote.c:1517 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1520 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1527 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1568 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "Sẽ không xóa những địa chỉ URL không-push" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Không hiểu câu lệnh con: %s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<các-tùy-chọn>]" @@ -10962,8 +11719,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] <tree-ish> [--] <đường-dẫn>…" +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<tree-ish>] [--] <đường-dẫn>…" #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -11083,27 +11840,27 @@ msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-list.c:362 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list không hỗ trợ hiển thị các ghi chú" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "giữ lại “--” chuyển sang làm tham số" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "kết xuất trong định dạng gậy dài" -#: 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" @@ -11194,7 +11951,7 @@ msgstr "giữ lại các lần chuyển giao dư thừa, rỗng" msgid "revert failed" msgstr "hoàn nguyên gặp lỗi" -#: builtin/revert.c:207 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "cherry-pick gặp lỗi" @@ -11357,70 +12114,123 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<nền>]] [--list] [<ref>]" -#: 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] "đang bỏ qua %s; không thể xử lý nhiều hơn %d tham chiếu" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "không tham chiếu nào khớp với %s" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "hiển thị các nhánh remote-tracking và nội bộ" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "hiển thị các nhánh remote-tracking" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "màu “*!+-” tương ứng với nhánh" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "đồng nghĩa với more=-1" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "chặn các chuỗi đặt tên" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "bao gồm nhánh hiện hành" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "<n>[,<cơ_sở>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog là không tương thích với các tùy chọn --all, --remotes, --" +"independent hay --merge-base" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "--reflog cần tên một nhánh" + +#: 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] "chỉ có thể hiển thị cùng lúc %d hạng mục." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "không có tham chiếu nào như thế %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] "không thể xử lý nhiều hơn %d điểm xét duyệt." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "“%s” không phải tham chiếu hợp lệ." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "không thể tìm thấy lần chuyển giao %s (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11485,12 +12295,12 @@ msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú" msgid "prepend comment character and space to each line" msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng" -#: 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 "Không có tham chiếu nào như thế: %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 "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s" @@ -11500,76 +12310,95 @@ msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận đượ msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" -#: 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 "điểm neo thay thế cho các đường dẫn tương đối" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: 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 "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules" -#: builtin/submodule--helper.c:364 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:368 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%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 "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%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 "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [</đường/dẫn>]" -#: builtin/submodule--helper.c:430 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“%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 "mô-đun-con “%s” không thể thêm thay thế: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "nhân bản mô-đun-con mới vào chỗ nào" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "url nơi mà nhân bản mô-đun-con từ đó" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:504 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "ép buộc tiến trình nhân bản" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11577,99 +12406,99 @@ msgstr "" "git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference " "<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]" -#: 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 "không thể tạo thư mục “%s”" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Nhân bản “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "không thể mở tập tin “%s”" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "không thể đóng tập tin %s" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "không thể lấy thư mục mô-đun-con cho “%s”" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?" -#: builtin/submodule--helper.c:641 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s" -#: builtin/submodule--helper.c:662 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:792 +#: builtin/submodule--helper.c:913 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình" -#: builtin/submodule--helper.c:803 +#: builtin/submodule--helper.c:924 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:831 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" "Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" -#: builtin/submodule--helper.c:838 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:840 +#: builtin/submodule--helper.c:961 msgid "whether the initial clone should follow the shallow recommendation" msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không" -#: builtin/submodule--helper.c:841 +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: 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=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:927 +#: builtin/submodule--helper.c:1050 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -11678,11 +12507,11 @@ msgstr "" "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu " "dự án lại không trên bất kỳ nhánh nào" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "lệnh con submodule--helper phải được gọi với một lệnh con" -#: builtin/submodule--helper.c:984 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ" @@ -11919,7 +12748,7 @@ msgstr "Thẻ “%s” đã tồn tại rồi" msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "Đang giải nén các đối tượng" @@ -11983,135 +12812,151 @@ msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư m msgid " OK" msgstr " Đồng ý" -#: builtin/update-index.c:575 +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "refresh: lờ đi mô-đun-con" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "không bỏ qua các tập tin mới tạo" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "để các tập tin thay thế các thư mục và “vice-versa”" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "" "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "Đánh dấu các tập tin là \"không thay đổi\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "đánh dấu các tập tin là “chỉ-đọc”" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "xóa bít skip-worktree" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "" "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "" "gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " "làm việc" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "ghi mục lục ở định dạng này" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "bật/tắt bộ đệm không theo vết" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin" -#: 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 được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực " +"sự muốn tắt bộ đệm chưa theo dõi" + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" msgstr "Nhớ đệm không theo vết bị tắt" -#: 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 được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " +"muốn bật bộ đệm chưa theo dõi" + +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Nhớ đệm không theo vết được bật cho “%s”" @@ -12308,26 +13153,39 @@ msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" msgid "only useful for debugging" msgstr "chỉ hữu ích khi cần gỡ lỗi" -#: upload-pack.c:20 +#: upload-pack.c:22 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>" -#: upload-pack.c:837 +#: upload-pack.c:1028 msgid "quit after a single request/response exchange" msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn" -#: upload-pack.c:839 +#: upload-pack.c:1030 msgid "exit immediately after initial ref advertisement" msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu" -#: upload-pack.c:841 +#: upload-pack.c:1032 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git" -#: upload-pack.c:843 +#: upload-pack.c:1034 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "ngắt truyền thông sau <n> giây không hoạt động" +#: 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 "" +"Quyền hạn trên thư mục gói mạng của bạn không chính xác; người dùng\n" +"khác có lẽ có thể đọc được chứng thư được lưu đệm của bạn. Cân nhắc chạy:\n" +"\n" +"\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn" @@ -12342,7 +13200,11 @@ msgstr "" "hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n" "để xem các đặc tả cho lệnh hay khái niệm cụ thể." -#: http.c:323 +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "Điều khiển giao quyền không được hỗ trợ với cURL < 7.22.0" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0" @@ -12460,15 +13322,15 @@ msgstr "ngày hết hạn" msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:237 +#: parse-options.h:238 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:239 +#: parse-options.h:240 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:245 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" @@ -12689,8 +13551,8 @@ msgid "Automated merge did not work." msgstr "Hòa trộn một cách tự động không làm việc." #: git-merge-octopus.sh:62 -msgid "Should not be doing an Octopus." -msgstr "Không thể thực hiện một Octopus." +msgid "Should not be doing an octopus." +msgstr "Không thể thực hiện một octopus." #: git-merge-octopus.sh:73 #, sh-format @@ -12882,6 +13744,10 @@ msgstr "Bạn chưa còn có lần chuyển giao khởi tạo" msgid "Cannot save the current index state" msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành" +#: git-stash.sh:103 +msgid "Cannot save the untracked files" +msgstr "Không thể ghi lại các tập tin chưa theo dõi" + #: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành" @@ -12923,6 +13789,10 @@ msgstr "" " Để có thể dùng lời chú thích có chứa -- ở đầu,\n" " dùng git stash save -- \"$option\"" +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc." + #: git-stash.sh:259 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" @@ -12944,99 +13814,103 @@ msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $sta msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: git-stash.sh:404 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "không hiểu tùy chọn: $opt" -#: git-stash.sh:414 +#: git-stash.sh:416 msgid "No stash found." msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào." -#: git-stash.sh:421 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV" -#: git-stash.sh:427 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference không phải là tham chiếu hợp lệ" -#: git-stash.sh:455 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)" -#: git-stash.sh:466 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "”$args” không phải tham chiếu đến stash" -#: git-stash.sh:474 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "không thể làm tươi mới bảng mục lục" -#: git-stash.sh:478 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: git-stash.sh:486 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: git-stash.sh:488 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "Không thể ghi lại cây chỉ mục" -#: git-stash.sh:522 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "Không thể phục hồi các tập tin chưa theo dõi từ stash" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa" -#: git-stash.sh:537 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: git-stash.sh:551 +#: git-stash.sh:562 msgid "The stash is kept in case you need it again." msgstr "stash được giữ trong trường hợp bạn lại cần nó." -#: git-stash.sh:560 +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Đã xóa ${REV} ($s)" -#: git-stash.sh:561 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-stash.sh:569 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: git-stash.sh:641 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"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 "" "Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm " "việc" -#: git-submodule.sh:193 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" -#: git-submodule.sh:210 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi" -#: git-submodule.sh:214 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13048,23 +13922,23 @@ msgstr "" "$sm_path\n" "Sử dụng -f nếu bạn thực sự muốn thêm nó vào." -#: git-submodule.sh:232 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục" -#: 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” đã tồn tại từ trước và không phải là một kho git hợp lệ" -#: git-submodule.sh:242 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" -#: 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" @@ -13080,48 +13954,48 @@ msgstr "" "hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy " "chọn “--name”." -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." -#: git-submodule.sh:262 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Không thể lấy ra mô-đun-con “$sm_path”" -#: git-submodule.sh:267 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”" -#: git-submodule.sh:276 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”" -#: git-submodule.sh:323 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "Đang vào “$displaypath”" -#: git-submodule.sh:343 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Dừng lại tại “$displaypath”; script trả về trạng thái khác không." -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "đặc tả đường dẫn và --all xung khắc nhau" -#: git-submodule.sh:419 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con" -#: git-submodule.sh:439 +#: git-submodule.sh:440 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13131,7 +14005,7 @@ msgstr "" "(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " "chúng)" -#: git-submodule.sh:447 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13140,39 +14014,39 @@ msgstr "" "Cây làm việc mô-đun-con “$displaypath” chứa các thay đổi nội bộ; hãy dùng “-" "f” để loại bỏ chúng đi" -#: git-submodule.sh:450 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Đã tạo thư mục “$displaypath”" -#: git-submodule.sh:451 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “$displaypath”" -#: git-submodule.sh:454 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”" -#: git-submodule.sh:463 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:622 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:627 +#: git-submodule.sh:632 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -13181,12 +14055,12 @@ msgstr "" "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong " "đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:645 +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:651 +#: git-submodule.sh:656 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -13195,90 +14069,86 @@ msgstr "" "Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. " "Lấy về theo định hướng của lần chuyển giao đó gặp lỗi." -#: git-submodule.sh:658 +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:659 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:663 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:664 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”" -#: git-submodule.sh:669 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:670 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:675 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:676 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”" -#: git-submodule.sh:707 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:815 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" -#: git-submodule.sh:867 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:887 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src" -#: git-submodule.sh:890 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $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 "" " Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và " "$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 "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:1107 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”" @@ -13576,8 +14446,12 @@ msgstr "" "Nên bỏ qua." #: git-rebase--interactive.sh:1044 -msgid "You can fix this with 'git rebase --edit-todo'." -msgstr "Bạn có thể sửa nó bằng “git rebase --edit-todo”." +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "" +"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --" +"continue”." #: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." @@ -13600,12 +14474,12 @@ 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 "" -"Bạn có các thay đổi so với trong bệ phóng trong thư mục làm việc của bạn.\n" -"Nếu các thay đổi này là muốn\n" +"Bạn có các thay đổi so với trong bệ phóng trong\n" +"thư mục làm việc của bạn. Nếu các thay đổi này là muốn\n" "squash vào lần chuyển giao kế trước, chạy:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" @@ -13649,43 +14523,39 @@ 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 "Không thể thực thi trình biên soạn" -#: git-rebase--interactive.sh:1145 -msgid "You need to set your committer info first" -msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã" - -#: git-rebase--interactive.sh:1153 +#: git-rebase--interactive.sh:1150 #, sh-format msgid "Could not checkout $switch_to" msgstr "Không thể checkout $switch_to" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1155 msgid "No HEAD?" msgstr "Không HEAD?" -#: git-rebase--interactive.sh:1159 +#: git-rebase--interactive.sh:1156 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Không thể tạo thư mục tạm thời $state_dir" -#: git-rebase--interactive.sh:1161 +#: git-rebase--interactive.sh:1158 msgid "Could not mark as interactive" msgstr "Không thể đánh dấu là tương tác" -#: 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 "Không thể khởi tạo các lần chuyển giao ghi lại" -#: 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] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)" -#: git-rebase--interactive.sh:1281 +#: git-rebase--interactive.sh:1278 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -13694,7 +14564,7 @@ msgstr "" "\n" "Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1285 msgid "Note that empty commits are commented out" msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú" @@ -13725,6 +14595,11 @@ msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" "Không thể ghi lại các nhánh: Bạn có các thay đổi chưa được đưa lên bệ phóng." +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" +"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng." + #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." @@ -13735,6 +14610,10 @@ msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" "Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao." +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao." + #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." @@ -13742,6 +14621,11 @@ msgstr "" "Không thể $action: Mục lục của bạn có chứa các thay đổi chưa được chuyển " "giao." +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "" +"Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." + #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất của cây làm việc." @@ -13750,6 +14634,43 @@ msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất củ msgid "Unable to determine absolute path of git directory" msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git" +#~ msgid "Could not write to %s" +#~ msgstr "Không thể ghi vào %s" + +#~ msgid "Error wrapping up %s." +#~ msgstr "Lỗi bao bọc %s." + +#~ msgid "Your local changes would be overwritten by cherry-pick." +#~ msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick." + +#~ msgid "Cannot revert during another revert." +#~ msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác." + +#~ msgid "Cannot cherry-pick during another cherry-pick." +#~ msgstr "" +#~ "Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác." + +#~ msgid "Could not parse line %d." +#~ msgstr "Không phân tích được dòng %d." + +#~ msgid "Could not open %s" +#~ msgstr "Không thể mở %s" + +#~ msgid "Could not read %s." +#~ msgstr "Không thể đọc %s." + +#~ msgid "Could not format %s." +#~ msgstr "Không thể định dạng “%s”." + +#~ msgid "%s: %s" +#~ msgstr "%s: %s" + +#~ msgid "cannot open %s: %s" +#~ msgstr "không thể mở %s: %s" + +#~ msgid "You need to set your committer info first" +#~ msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã" + #~ msgid "bad numeric config value '%s' for '%s': invalid unit" #~ msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: đơn vị sai" @@ -13930,9 +14851,6 @@ msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục gi #~ msgstr "" #~ "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#~ msgid "Could not write to '%s'" -#~ msgstr "Không thể ghi vào “%s”" - #~ msgid "Writing SQUASH_MSG" #~ msgstr "Đang ghi SQUASH_MSG" @@ -14569,6 +15487,3 @@ msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục gi #~ msgid "Could not extract email from committer identity." #~ msgstr "" #~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao" - -#~ msgid "could not parse commit %s\n" -#~ msgstr "không thể phân tích commit (lần chuyển giao) %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index dc31222..1ce2533 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -135,8 +135,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-09-05 23:36+0800\n" +"POT-Creation-Date: 2016-11-22 22:10+0800\n" +"PO-Revision-Date: 2016-11-22 22:15+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -216,7 +216,8 @@ msgid "" msgstr "" "注意：正在检出 '%s'。\n" "\n" -"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另外\n" +"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另" +"外\n" "的检出分支操作丢弃在这个状态下所做的任何提交。\n" "\n" "如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n" @@ -225,6 +226,610 @@ msgstr "" " git checkout -b <new-branch-name>\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 和 --3say 不能同时使用。" + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached 和 --3way 不能同时使用。" + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way 在一个仓库之外" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index 在一个仓库之外" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached 在一个仓库之外" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "无法准备时间戳正则表达式 %s" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec 返回 %d，输入为：%s" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "不能在补丁的第 %d 行找到文件名" + +#: apply.c:977 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %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 行）" +msgstr[1] "当移除 %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 行）" +msgstr[1] "块 #%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 "仓库缺乏必要的数据对象以进行三方合并。" + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "回落到三方合并...\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "无法读取 '%s' 的当前内容" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "无法回落到三方合并...\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "应用补丁到 '%s' 存在冲突。\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "成功应用补丁到 '%s'。\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "移除补丁仍留下了文件内容" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "%s：错误类型" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s 的类型是 %o，应为 %o" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "无效路径 '%s'" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "%s：已经存在于索引中" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s：已经存在于工作区中" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "%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 "子模组 %s 的 sha1 信息缺失或无效" + +#: 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' 的状态" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "不能为新建文件 %s 创建后端存储" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "无法为 %s 添加缓存条目" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "无法写入 '%s'" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "关闭文件 '%s'" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "不能写文件 '%s' 权限 %o" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "成功应用补丁 %s。" + +#: apply.c:4518 +msgid "internal error" +msgstr "内部错误" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." +msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "截短 .rej 文件名为 %.*s.rej" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "不能打开 %s" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "第 #%d 个片段成功应用。" + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "拒绝第 #%d 个片段。" + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "略过补丁 '%s'。" + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "未能识别的输入" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "无法读取索引文件" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "不能打开补丁 '%s'：%s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "抑制下仍有 %d 个空白字符误用" +msgstr[1] "抑制下仍有 %d 个空白字符误用" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d 行有空白字符误用。" +msgstr[1] "%d 行有空白字符误用。" + +#: apply.c:4872 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "修复空白错误后，应用了 %d 行。" +msgstr[1] "修复空白错误后，应用了 %d 行。" + +#: 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 "如果一个补丁不能应用则尝试三方合并" + +#: 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 [<选项>] <树或提交> [<路径>...]" @@ -243,7 +848,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' 未匹配任何文件" @@ -256,7 +861,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:430 builtin/log.c:1422 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "前缀" @@ -264,11 +869,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 "文件" @@ -300,8 +905,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 "仓库" @@ -309,7 +914,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 "命令" @@ -578,27 +1183,27 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:266 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" -#: branch.c:286 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" -#: branch.c:291 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:345 +#: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:364 +#: branch.c:363 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" @@ -613,7 +1218,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" 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'" @@ -622,9 +1227,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 "版本遍历设置失败" @@ -664,7 +1269,7 @@ msgstr "rev-list 终止" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -687,8 +1292,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 "不能解析 %s" @@ -698,6 +1303,16 @@ msgstr "不能解析 %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 "内存耗尽" @@ -780,7 +1395,7 @@ msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" -#: config.c:849 config.c:860 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" @@ -823,22 +1438,65 @@ msgstr "不能设置 '%s' 为 '%s'" 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" +"请确认您有正确的访问权限并且仓库存在。" + #: 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 "在将来" @@ -912,28 +1570,33 @@ msgstr[1] "%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:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "选项 '%s' 需要一个值" + # 译者：注意保持前导空格 -#: diff.c:116 +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%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" @@ -942,16 +1605,20 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\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" @@ -960,61 +1627,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：应为 shallow 列表" + +#: 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：无法派生 sideband 多路输出" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "协议错误：坏的包头" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack：无法派生进程 %s" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "%s 失败" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "sideband 多路输出出错" + +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "服务器不支持 shalllow 客户端" + +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "服务器支持 multi_ack_detailed" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "服务器支持 no-done" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "服务器支持 multi_ack" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "服务器支持 side-band-64k" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "服务器支持 side-band" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "服务器支持 allow-tip-sha1-in-want" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "服务器支持 allow-reachable-sha1-in-want" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "服务器支持 ofs-delta" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "服务器版本 %.*s" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "服务器不支持 --shallow-since" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "服务器不支持 --shallow-exclude" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "服务器不支持 --deepen" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "没有共同的提交" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack：获取失败。" + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "没有匹配的远程分支" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: gpg-interface.c:208 +#: gpg-interface.c:215 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:210 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: grep.c:1792 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: grep.c:1820 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:309 +#: help.c:306 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1023,11 +1871,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1036,17 +1884,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" "是 '%s'" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:404 help.c:470 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -1060,11 +1908,36 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: help.c:466 +#: help.c:461 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" +#: ident.c:334 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" +"\n" +"*** 请告诉我你是谁。\n" +"\n" +"运行\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"来设置您账号的缺省身份标识。\n" +"如果仅在本仓库设置身份标识，则省略 --global 参数。\n" + #: lockfile.c:152 #, c-format msgid "" @@ -1092,8 +1965,8 @@ msgstr "不能创建 '%s.lock'：%s" 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 "无法写新的索引文件" @@ -1129,7 +2002,7 @@ msgstr "：可能是一个目录/文件冲突？" msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:796 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" @@ -1270,7 +2143,7 @@ msgstr "略过 %s（已经做过相同合并）" msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1736 git-submodule.sh:919 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "子模组" @@ -1335,6 +2208,22 @@ msgstr "不能解析对象 '%s'" msgid "Unable to write index." msgstr "不能写入索引。" +#: notes-merge.c:273 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" +"您尚未结束您前一次注释合并（存在 %s）。\n" +"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 'git " +"notes merge --abort' 来提交/终止前一次合并。" + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "您尚未结束注释合并（存在 %s）。" + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" @@ -1392,7 +2281,7 @@ msgstr "-数字" msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: path.c:798 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" @@ -1446,12 +2335,20 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: pathspec.c:433 +#: pathspec.c:408 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" +msgstr "" +"在即将到来的版本，不能再使用空字符串作为路径表达式。如果要匹配所有路径，\n" +"请代之以 ." + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1459,15 +2356,11 @@ msgstr "" "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" "添加 ':/' 或 '.' ？" -#: pretty.c:973 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: progress.c:235 -msgid "done" -msgstr "完成" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1476,7 +2369,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1485,22 +2378,22 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: refs.c:551 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:2537 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" -#: refs/files-backend.c:2546 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" @@ -1629,12 +2522,12 @@ msgstr "忽略带有错误名称 %s 的引用" msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" @@ -1758,51 +2651,59 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: revision.c:2132 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2135 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2329 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "不能调用 dup2(%d,%d)" -#: send-pack.c:298 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "无法为推送证书签名" -#: send-pack.c:411 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: 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>'" @@ -1810,7 +2711,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: 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" @@ -1819,229 +2720,255 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:190 sequencer.c:841 sequencer.c:924 +#: sequencer.c:244 sequencer.c:1209 #, c-format -msgid "Could not write to %s" -msgstr "不能写入 %s" +msgid "could not lock '%s'" +msgstr "不能锁定 '%s'" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, c-format -msgid "Error wrapping up %s." -msgstr "错误收尾 %s。" +msgid "could not write to '%s'" +msgstr "不能写入 '%s'" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "您的本地修改将被拣选操作覆盖。" +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s" +msgstr "不能将换行符写入 '%s'" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "您的本地修改将被还原操作覆盖。" +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "无法完成 '%s'。" -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" + +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "您的本地修改将被%s覆盖。" + +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" -#: sequencer.c:228 +#: sequencer.c:324 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:303 +#: sequencer.c:399 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" +#: sequencer.c:438 +msgid "unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:393 +#: sequencer.c:483 #, c-format -msgid "Could not parse commit %s\n" +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交，执行：\n" +"\n" +" git commit --amend %s\n" +"\n" +"如果这些变更要形成一个新提交，执行：\n" +"\n" +" git commit %s\n" +"\n" +"无论哪种情况，当您完成提交，继续执行：\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:567 +#, c-format +msgid "could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: 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 "不能解析父提交 %s\n" -#: 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 "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:490 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "提交 %s 没有父提交 %d" +msgid "commit %s does not have parent %d" +msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:494 +#: sequencer.c:687 #, c-format -msgid "Mainline was specified but commit %s is not a merge." -msgstr "指定了主线但提交 %s 不是一个合并。" +msgid "mainline was specified but commit %s is not a merge." +msgstr "指定了主线，但是提交 %s 不是一个合并提交。" -#. 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：不能解析父提交 %s" -#: sequencer.c:511 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" +msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:597 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:598 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:633 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:641 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:645 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:705 -msgid "Cannot revert during another revert." -msgstr "不能在回退中执行另一回退。" - -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "不能在拣选中执行回退。" - -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "不能在回退中执行拣选。" - -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "不能在拣选过程中执行另一拣选。" - -#: sequencer.c:732 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "不能解析第 %d 行。" +msgid "invalid line %d: %.*s" +msgstr "无效行 %d：%.*s" -#: sequencer.c:737 -msgid "No commits parsed." -msgstr "没有提交被解析。" +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "没有解析提交。" -#: sequencer.c:749 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "不能打开 %s" +msgid "could not read '%s'." +msgstr "不能读取 '%s'。" -#: sequencer.c:753 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "不能读取 %s。" +msgid "unusable instruction sheet: '%s'" +msgstr "无用的指令清单：'%s'" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "无用的指令表单：%s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "不能在回退中执行拣选。" + +#: 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 "无效键名：%s" -#: 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 "%s 的值无效：%s" -#: sequencer.c:803 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "非法的选项表单：%s" +msgid "malformed options sheet: '%s'" +msgstr "非法的选项清单：'%s'" -#: sequencer.c:822 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:823 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "不能创建序列目录 %s" +msgid "could not create sequencer directory '%s'" +msgstr "不能创建序列目录 '%s'" + +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "不能锁定 HEAD" -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:864 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:866 sequencer.c:900 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 +#: sequencer.c:1175 builtin/grep.c:578 #, c-format -msgid "cannot open %s" -msgstr "不能打开 %s" +msgid "cannot open '%s'" +msgstr "不能打开 '%s'" -#: sequencer.c:888 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "不能读取 %s：%s" +msgid "cannot read '%s': %s" +msgstr "不能读取 '%s'：%s" -#: sequencer.c:889 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:895 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "不能格式化 %s。" - -#: sequencer.c:1066 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:1069 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "不能作为初始提交还原" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "不能作为初始提交回退" #: setup.c:160 #, c-format @@ -2074,11 +3001,6 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "无法读取 %s" - #: setup.c:468 #, c-format msgid "Expected git repo version <= %d, found %d" @@ -2124,21 +3046,55 @@ msgstr "" "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: sha1_file.c:1046 +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "路径 '%s' 不存在" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "参考仓库 '%s' 不是一个本地仓库。" + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "参考仓库 '%s' 是一个浅克隆" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "参考仓库 '%s' 已被嫁接" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: sha1_file.c:2434 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: sha1_file.c:2438 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "歧义的短 SHA1 %s" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "候选者有：" + +#: sha1_name.c:578 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -2182,7 +3138,7 @@ msgstr "无法移除 %s 的 .gitmodules 条目" msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "submodule.fetchJobs 不允许为负值" @@ -2191,56 +3147,56 @@ msgstr "submodule.fetchJobs 不允许为负值" msgid "invalid value for %s" msgstr "%s 的值无效" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "执行 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 "键 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "签名 '%.*s' 的键为空" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "不能获取 %s 的文件状态" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s 不是一个正规文件" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户不可写" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "不能打开临时文件" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重命名临时文件为 %s" @@ -2255,14 +3211,14 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:771 +#: transport.c:817 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:775 +#: transport.c:821 #, c-format msgid "" "\n" @@ -2289,15 +3245,31 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:783 +#: transport.c:829 msgid "Aborting." msgstr "正在终止。" -#: transport-helper.c:1041 +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "不能读取引用 %s" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "太短的树对象" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "树对象中的条目属性错误" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "树对象条目中空的文件名" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "太短的树文件" + #: unpack-trees.c:64 #, c-format msgid "" @@ -2488,21 +3460,21 @@ 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 "" -"工作区中下列文件将会因为稀疏检出而被覆盖：\n" +"工作区中下列文件将被稀疏检出更新所覆盖：\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 "" -"工作区中下列文件将会因为稀疏检出而被删除：\n" +"工作区中下列文件将被稀疏检出更新所删除：\n" "%s" #: unpack-trees.c:205 @@ -2553,14 +3525,14 @@ msgstr "无法读取 '%s'" msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 -#: builtin/pull.c:407 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" @@ -2584,155 +3556,155 @@ msgstr "不能写入 %s" msgid "could not close %s" msgstr "不能关闭 %s" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:198 wt-status.c:882 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:216 wt-status.c:891 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "双方修改：" -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "新文件：" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "拷贝：" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "删除：" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "修改：" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "重命名：" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "类型变更：" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "未知：" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:756 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:758 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:839 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2740,73 +3712,73 @@ msgstr "" "不要改动上面的一行。\n" "下面的所有内容均将被删除。" -#: wt-status.c:950 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:953 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:955 +#: wt-status.c:1018 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:960 +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:963 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:973 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:976 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:980 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:982 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:984 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1109 +#: wt-status.c:1172 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1112 +#: wt-status.c:1175 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" msgstr[1] "最后的命令已完成（%d 条命令被执行）：" -#: wt-status.c:1123 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1128 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1131 +#: wt-status.c:1194 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -2814,165 +3786,165 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1139 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1152 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1157 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1171 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1173 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1175 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1181 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1185 +#: wt-status.c:1248 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1190 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1193 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1197 +#: wt-status.c:1260 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1202 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1205 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1207 +#: wt-status.c:1270 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1217 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1222 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1225 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1227 +#: wt-status.c:1290 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1236 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1241 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1244 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1246 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1257 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1261 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1264 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1464 +#: wt-status.c:1524 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1470 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1472 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1477 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "头指针分离于 " -#: 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" @@ -2982,88 +3954,103 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1526 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1528 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1534 +#: wt-status.c:1594 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1539 +#: wt-status.c:1599 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1542 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1545 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1548 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1551 +#: wt-status.c:1611 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1554 wt-status.c:1559 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1557 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1561 +#: wt-status.c:1621 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" # 译者：注意保持句尾空格 -#: wt-status.c:1668 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "初始提交于 " -#: wt-status.c:1672 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1701 +#: wt-status.c:1761 msgid "gone" msgstr "丢失" # 译者：注意保持句尾空格 -#: wt-status.c:1703 wt-status.c:1711 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "落后 " -#: wt-status.c:1706 wt-status.c:1709 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "领先 " -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "不能%s：您有未暂存的变更。" + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "而且您的索引中包含未提交的变更。" + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "不能%s：您的索引中包含未提交的变更。" + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" @@ -3072,270 +4059,255 @@ msgstr "无法删除 '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <路径规格>..." -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:71 builtin/commit.c:281 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:81 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:136 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:196 builtin/rev-parse.c:811 +#: builtin/add.c:209 builtin/rev-parse.c:840 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:207 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "无法打开 '%s' 进行写入。" -#: builtin/add.c:211 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:214 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c:217 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:219 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:224 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:234 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 -#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "演习" -#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 -#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 -#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "冗长输出" - -#: builtin/add.c:256 +#: builtin/add.c:269 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:258 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:259 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:260 +#: builtin/add.c:273 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:261 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:262 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:265 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:267 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:268 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:269 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:270 builtin/update-index.c:958 +#: builtin/add.c:283 builtin/update-index.c:947 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:270 builtin/update-index.c:959 +#: builtin/add.c:283 builtin/update-index.c:948 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c:292 +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:300 +#: builtin/add.c:312 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:336 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:343 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:352 +#: builtin/add.c:359 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:367 +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:368 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 +#: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "无法写入新索引文件" - -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "不能读取 '%s'" - -#: builtin/am.c:426 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:503 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:544 builtin/notes.c:301 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:581 builtin/notes.c:316 +#: builtin/am.c:569 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:607 +#: builtin/am.c:595 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:787 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:852 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:899 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:902 builtin/am.c:910 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:907 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:996 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: builtin/am.c:1001 builtin/clone.c:380 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "无法拆分补丁。" -#: builtin/am.c:1137 builtin/commit.c:366 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1188 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1189 +#: builtin/am.c:1177 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1190 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1328 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "补丁为空。是不是切分错误？" -#: builtin/am.c:1402 builtin/log.c:1543 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/am.c:1429 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: builtin/am.c:1602 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1604 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1623 +#: builtin/am.c:1631 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -3343,37 +4315,37 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1629 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1654 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1679 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/am.c:1686 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 #: builtin/merge.c:823 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/am.c:1731 builtin/am.c:1735 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1751 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: builtin/am.c:1756 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "提交内容为：" @@ -3382,35 +4354,35 @@ 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 "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1816 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1853 builtin/am.c:1925 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1869 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1877 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1883 +#: builtin/am.c:1891 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "失败的补丁文件副本位于：%s" -#: builtin/am.c:1928 +#: builtin/am.c:1936 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -3420,7 +4392,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1935 +#: builtin/am.c:1943 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -3428,170 +4400,149 @@ msgstr "" "您的索引中仍有未合并的路径。\n" "您是否忘了执行 'git add'？" -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2095 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "无法清空索引" -#: builtin/am.c:2129 +#: builtin/am.c:2137 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2192 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2225 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2226 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2232 +#: builtin/am.c:2240 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2234 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2236 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:172 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2239 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2242 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2244 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2246 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2248 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2250 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2253 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2256 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "动作" - -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/am.c:2285 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "根目录" - -#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 -#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 -#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 -#: builtin/submodule--helper.c:826 -msgid "path" -msgstr "路径" - -#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 -#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 -#: parse-options.h:132 parse-options.h:134 parse-options.h:244 +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 +#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2278 builtin/apply.c:4805 -msgid "num" -msgstr "数字" - -#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "格式" -#: builtin/am.c:2282 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2288 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2290 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2293 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2296 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2299 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2303 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2305 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2308 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2311 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2326 +#: builtin/am.c:2334 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -3599,16 +4550,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2333 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "无法读取索引" -#: builtin/am.c:2348 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2372 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" @@ -3617,483 +4568,14 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2378 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/apply.c:122 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<选项>] [<补丁>...]" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "未能识别的空白字符选项 '%s'" - -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "未能识别的空白字符忽略选项 '%s'" - -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "无法准备时间戳正则表达式 %s" - -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec 返回 %d，输入为：%s" - -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "不能在补丁的第 %d 行找到文件名" - -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" - -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" - -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" - -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" - -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount：意外的行：%.*s" - -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 行的补丁片段没有头信息：%.*s" - -#: builtin/apply.c:1567 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" - -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "新文件依赖旧内容" - -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "删除的文件仍有内容" - -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" -msgstr "补丁在第 %d 行损坏" - -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "新文件 %s 依赖旧内容" - -#: builtin/apply.c:1812 -#, c-format -msgid "deleted file %s still has contents" -msgstr "删除的文件 %s 仍有内容" - -#: builtin/apply.c:1815 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** 警告：文件 %s 成为空文件但并未删除" - -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "二进制补丁在第 %d 行损坏：%.*s" - -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "未能识别的二进制补丁位于第 %d 行" - -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "补丁文件的第 %d 行只有垃圾数据" - -#: builtin/apply.c:2244 -#, c-format -msgid "unable to read symlink %s" -msgstr "无法读取符号链接 %s" - -#: builtin/apply.c:2248 -#, c-format -msgid "unable to open or read %s" -msgstr "不能打开或读取 %s" - -#: builtin/apply.c:2901 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "无效的行首字符：'%c'" - -#: builtin/apply.c:3020 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" -msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" - -#: builtin/apply.c:3032 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" - -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"当查询：\n" -"%.*s" - -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "缺失 '%s' 的二进制补丁数据" - -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "二进制补丁未应用到 '%s'" - -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" - -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "打补丁失败：%s:%ld" - -#: builtin/apply.c:3314 -#, c-format -msgid "cannot checkout %s" -msgstr "不能检出 %s" - -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "读取位于符号链接中的 '%s'" - -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "路径 %s 已经被重命名/删除" - -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s：不存在于索引中" - -#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 -#, c-format -msgid "%s: %s" -msgstr "%s：%s" - -#: builtin/apply.c:3491 builtin/apply.c:3652 -#, c-format -msgid "%s: does not match index" -msgstr "%s：和索引不匹配" - -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "移除补丁仍留下了文件内容" - -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s：错误类型" - -#: builtin/apply.c:3671 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s 的类型是 %o，应为 %o" - -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" -msgstr "无效路径 '%s'" - -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" -msgstr "%s：已经存在于索引中" - -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s：已经存在于工作区中" - -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" - -#: builtin/apply.c:3907 -#, 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）不匹配" - -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "受影响的文件 '%s' 位于符号链接中" - -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s：补丁未应用" - -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "检查补丁 %s..." - -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "对路径 '%s' 的 make_cache_entry 操作失败" - -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "不能从索引中移除 %s" - -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "子模组 %s 损坏的补丁" - -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "不能枚举新建文件 '%s' 的状态" - -#: builtin/apply.c:4224 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "不能为新建文件 %s 创建后端存储" - -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "无法为 %s 添加缓存条目" - -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "关闭文件 '%s'" - -#: builtin/apply.c:4313 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "不能写文件 '%s' 权限 %o" - -#: builtin/apply.c:4403 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "成功应用补丁 %s。" - -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "内部错误" - -#: builtin/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." -msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." - -#: builtin/apply.c:4424 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "截短 .rej 文件名为 %.*s.rej" - -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "不能打开 %s：%s" - -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "第 #%d 个片段成功应用。" - -#: builtin/apply.c:4448 -#, c-format -msgid "Rejected hunk #%d." -msgstr "拒绝第 #%d 个片段。" - -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." -msgstr "略过补丁 '%s'。" - -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "未能识别的输入" - -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "无法读取索引文件" - -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "--3way 在一个仓库之外" - -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "--index 在一个仓库之外" - -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "--cached 在一个仓库之外" - -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "不能打开补丁 '%s'" - -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "抑制下仍有 %d 个空白字符误用" -msgstr[1] "抑制下仍有 %d 个空白字符误用" - -#: builtin/apply.c:4766 builtin/apply.c:4776 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d 行有空白字符误用。" -msgstr[1] "%d 行有空白字符误用。" - -#: 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 "从传统的 diff 路径中移除指定数量的前导斜线" - -#: 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 "不应用补丁，而是显示输入的差异统计（diffstat）" - -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "以十进制数显示添加和删除的行数" - -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "不应用补丁，而是显示输入的概要" - -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "不应用补丁，而是查看补丁是否可应用" - -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "确认补丁可以应用到当前索引" - -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "应用补丁而不修改工作区" - -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "接受修改工作区之外文件的补丁" - -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" - -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "如果一个补丁不能应用则尝试三方合并" - -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" -msgstr "创建一个临时索引基于嵌入的索引信息" - -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" -msgstr "路径以 NUL 字符分隔" - -#: builtin/apply.c:4836 -msgid "ensure at least <n> lines of context match" -msgstr "确保至少匹配 <n> 行上下文" - -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "检查新增和修改的行中间的空白字符滥用" - -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "查找上下文时忽略空白字符的变更" - -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "反向应用补丁" - -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "无需至少一行上下文" - -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" - -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "允许重叠的补丁片段" - -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "允许不正确的文件末尾换行符" - -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "不信任补丁片段的头信息中的行号" - -#: builtin/apply.c:4862 -msgid "prepend <root> to all filenames" -msgstr "为所有文件名前添加 <根目录>" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -4127,7 +4609,7 @@ msgstr "git archive：协议错误" #: builtin/archive.c:68 msgid "git archive: expected a flush" -msgstr "git archive：应为刷新" +msgstr "git archive：应有一个 flush 刷新" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" @@ -4153,112 +4635,158 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" msgid "Blaming lines" msgstr "追踪代码行" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "使用一个试验性的基于空行的启发式算法改进差异显示" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "得分" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents 和 --reverse 不能混用。" + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "不能将 --contents 和最终的提交对象名共用" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "在 %2$s 中无此路径 %1$s" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "不能为路径 %2$s 读取对象 %1$s" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "文件 %s 只有 %lu 行" +msgstr[1] "文件 %s 只有 %lu 行" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" @@ -4508,6 +5036,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 "使用彩色输出" @@ -4580,8 +5112,8 @@ msgstr "key" 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 "对象" @@ -4594,7 +5126,7 @@ msgstr "只打印指向该对象的分支" msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" @@ -4701,63 +5233,79 @@ 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 "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" -">|--textconv) <对象>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:444 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:551 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" -msgstr "对于数据对象，对其内容执行 textconv" +msgstr "对于数据对象，对其内容做文本转换" + +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "对于数据对象，对其内容做过滤" + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "数据对象" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" @@ -4777,7 +5325,7 @@ msgstr "报告设置在文件上的所有属性" msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "从标准输入读出文件名" @@ -4785,7 +5333,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 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 "不显示进度报告" @@ -4875,9 +5423,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 "字符串" @@ -4948,55 +5496,55 @@ msgstr "不能同时更新路径并切换到分支'%s'。" msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:668 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:681 builtin/checkout.c:1070 +#: builtin/checkout.c:680 builtin/checkout.c:1069 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:683 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:734 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:740 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5017,7 +5565,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" @@ -5044,150 +5592,150 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:795 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:799 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:826 builtin/checkout.c:1065 +#: builtin/checkout.c:825 builtin/checkout.c:1064 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:971 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." -msgstr "只要一个引用，却给出了 %d 个" +msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1011 builtin/worktree.c:214 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1040 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1079 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1082 builtin/checkout.c:1086 +#: builtin/checkout.c:1081 builtin/checkout.c:1085 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 +#: builtin/checkout.c:1100 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1144 builtin/worktree.c:328 +#: builtin/checkout.c:1143 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1154 builtin/merge.c:231 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "风格" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <无此分支>'" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117 -#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1253 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5196,12 +5744,12 @@ msgstr "" "不能同时更新路径并切换到分支'%s'。\n" "您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1265 +#: builtin/checkout.c:1264 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1269 +#: builtin/checkout.c:1268 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5352,8 +5900,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 "模式" @@ -5391,113 +5939,130 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: 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 "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "名称" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 -#: builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/pull.c:202 msgid "depth" msgstr "深度" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "时间" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "从一个特定时间创建一个浅克隆" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "版本" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "通过排除版本来深化浅克隆的历史" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:98 builtin/init-db.c:482 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:99 builtin/init-db.c:483 +#: builtin/clone.c:108 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5505,57 +6070,42 @@ msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" -#: builtin/clone.c:307 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "参考仓库 '%s' 不是一个本地仓库。" - -#: builtin/clone.c:314 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' is shallow" -msgstr "参考仓库 '%s' 是一个浅克隆" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: 不能为 '%s' 添加一个备用：%s\n" -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "参考仓库 '%s' 已被嫁接" - -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:461 +#: builtin/clone.c:460 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5565,121 +6115,135 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git checkout -f HEAD' 重试\n" -#: builtin/clone.c:538 +#: builtin/clone.c:537 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必须的对象" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:863 builtin/receive-pack.c:1855 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:900 builtin/fetch.c:1293 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 #: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:997 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" +msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" + +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1000 +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:1058 builtin/clone.c:1066 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -5813,103 +6377,103 @@ msgstr "" "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" "操作。\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有非法的作者信息" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: builtin/commit.c:656 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:705 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5923,7 +6487,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5937,7 +6501,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5946,7 +6510,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5957,346 +6521,350 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:965 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1067 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1186 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 用脏索引修补最后一个提交。" -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "版本" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "条目以 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 "模式" -#: builtin/commit.c:1349 builtin/commit.c:1634 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "何时" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: 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 "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "强制编辑提交" # 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "default" -#: builtin/commit.c:1608 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1802 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -6461,11 +7029,20 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"无法用一个值覆盖多个值\n" +" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" + +#: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" @@ -6585,7 +7162,7 @@ msgstr "考虑最近 <n> 个标签（默认：10）" 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 "显示简写的提交号作为后备" @@ -6619,21 +7196,21 @@ msgstr "'%s'：不是一个正规文件或符号链接" msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "不是一个 git 仓库" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" @@ -6706,162 +7283,166 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:95 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:97 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:108 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" # 译者：可选值，不能翻译 -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:119 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "基于时间来深化浅克隆的历史" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "目录" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "递归的默认模式" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 -#: builtin/fetch.c:684 +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6871,87 +7452,95 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1201 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1219 +#: builtin/fetch.c:1257 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "--deepen 不支持负数深度" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen 和 --depth 是互斥的" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" @@ -6960,23 +7549,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "从文件中读取" @@ -7092,7 +7681,7 @@ msgstr "显示进度" msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "检查对象中" @@ -7181,225 +7770,220 @@ msgstr "grep：无法创建线程：%s" msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) 无效" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "不能打开 '%s'" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "分页" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:845 builtin/index-pack.c:1479 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" @@ -7415,83 +7999,87 @@ 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 "类型" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "打印所有可用的命令" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "排除向导" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "显示有用的指南列表" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "显示 man 手册" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "显示 info 手册" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "无法执行 '%s'" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7500,7 +8088,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7509,299 +8097,303 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:401 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: builtin/help.c:402 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "每一天 Git 常用的约 20 条命令" -#: builtin/help.c:403 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "Git 词汇表" -#: builtin/help.c:404 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: builtin/help.c:405 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: builtin/help.c:406 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: builtin/help.c:407 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:408 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: builtin/help.c:420 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "最常用的 Git 向导有：\n" -#: builtin/help.c:441 builtin/help.c:458 -#, c-format -msgid "usage: %s%s" -msgstr "用法：%s%s" - -#: builtin/help.c:474 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "用法：%s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" -msgstr "未能获取期望的对象 %s" +msgstr "未能获取预期的对象 %s" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" -msgstr "对象 %s：期待类型 %s，却是 %s" +msgstr "对象 %s：应为类型 %s，却是 %s" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "包超过了最大允许值" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: 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] "包文件过早结束，缺少 %<PRIuMAX> 字节" msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 -#: builtin/index-pack.c:808 builtin/index-pack.c:817 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:748 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1256 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" @@ -7841,95 +8433,95 @@ msgstr "包文件名 '%s' 没有以 '.pack' 结尾" msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "不能枚举 '%s' 状态" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "不能枚举模版 '%s' 状态" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s 已经存在" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s 已经存在" + +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:407 +#: builtin/init-db.c:408 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:455 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7937,32 +8529,32 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:513 builtin/init-db.c:518 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:543 +#: builtin/init-db.c:545 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -8073,37 +8665,34 @@ 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 "不正常的 in-reply-to：%s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 -#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 -#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 -#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "不能找到准确的合并基线。" -#: builtin/log.c:1263 +#: builtin/log.c:1267 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -8113,307 +8702,315 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<base-commit-id> 手动指定一个基线提交。" -#: 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 "无法得到补丁 id" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "生成一封附信" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1416 +#: builtin/log.c:1420 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1417 +#: builtin/log.c:1421 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "使用 [RFC PATCH] 代替 [PATCH]" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "header" -#: 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 "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: 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 "-n 和 -k 互斥。" -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix 和 -k 互斥。" +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc 和 -k 互斥。" -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "在子模组中递归" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "显示调试数据" @@ -8530,31 +9127,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 "（和 --stat 同义）" -#: builtin/merge.c:201 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "在提交前编辑提交说明" @@ -8562,28 +9159,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 "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "策略" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" @@ -8595,7 +9192,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 "允许合并不相关的历史" @@ -8811,55 +9408,55 @@ msgstr "拒绝合并无关的历史" msgid "Already up-to-date." msgstr "已经是最新的。" -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "已经是最新的。耶！" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1480 builtin/merge.c:1559 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -8884,23 +9481,23 @@ msgstr "git merge-base --is-ancestor <提交> <提交>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<提交>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "输出所有共同的祖先" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路合并的祖先提交" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "显示不能被其他访问到的版本" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先提交么？" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" @@ -8944,6 +9541,37 @@ msgstr "不要警告冲突" msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "未知选项 %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "不能解析对象 '%s'" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" +msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "不能处理两个头合并之外的任何操作。" + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "无法解析引用 '%s'" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "合并 %s 和 %s\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9052,43 +9680,43 @@ msgstr "重命名 %s 至 %s\n" msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" @@ -9220,7 +9848,7 @@ msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" #: 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 "请通过 -m 或 -F 选项为注解提供内容" #: builtin/notes.c:203 @@ -9229,7 +9857,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 "注解内容被留在 %s 中" #: builtin/notes.c:233 builtin/tag.c:439 @@ -9242,93 +9870,117 @@ msgstr "不能读取 '%s'" msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "无法解析 '%s' 为一个有效引用。" + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." +msgid "failed to read object '%s'." msgstr "无法读取对象 '%s'。" #: builtin/notes.c:261 #, c-format -msgid "Cannot read note data from non-blob object '%s'." -msgstr "不能从非数据对象 '%s' 中读取注解数据" +msgid "cannot read note data from non-blob object '%s'." +msgstr "不能从非数据对象 '%s' 中读取注解数据。" + +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "从 '%s' 拷贝注解到 '%s' 时失败" + +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" + +#: 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 "未发现对象 %s 的注解。" -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "允许保存空白注释" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:450 builtin/notes.c:529 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." +msgid "missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:587 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9337,288 +9989,318 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "无法删除引用 NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "无法删除引用 NOTES_MERGE_REF" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "无法删除 'git notes merge' 工作区" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "无法读取引用 NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "无法解析 NOTES_MERGE_REF" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "无法完成注解合并" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解合并策略 %s" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" +#: 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 "未知的 -s/--strategy：%s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "一个到 %s 的注解合并已经在 %s 执行中" +msgid "a notes merge into %s is already in-progress at %s" +msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" -msgstr "无法存储链接到当前注解的引用（%s）" +msgid "failed to store link to current notes ref (%s)" +msgstr "无法存储链接到当前的注解引用（%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 " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" -msgstr "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" +msgstr "" +"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" +"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "报告清除的注解" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" +msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: 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 "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "时间" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2704 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2706 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2710 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2712 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "显示被嫁接隐藏的提交" -#: builtin/pack-objects.c:2714 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:2716 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "对象计数中" @@ -9658,69 +10340,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 "%s 的值无效：%s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:147 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "自动在变基操作前后执行 stash/stash pop" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效：%s" -#: builtin/pull.c:379 git-sh-setup.sh:226 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "无法通过变基方式拉取：您有未暂存的变更。" - -#: builtin/pull.c:385 git-sh-setup.sh:252 -msgid "Additionally, your index contains uncommitted changes." -msgstr "而且您的索引中包含未提交的变更。" - -#: builtin/pull.c:387 git-sh-setup.sh:245 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。" - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:466 +#: builtin/pull.c:400 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9730,42 +10405,42 @@ msgstr "" "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库，您必须在命令行中指定一个分支名。" -#: builtin/pull.c:474 git-parse-remote.sh:73 +#: builtin/pull.c:408 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:489 git-parse-remote.sh:75 +#: builtin/pull.c:423 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:498 git-parse-remote.sh:95 +#: builtin/pull.c:432 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9774,19 +10449,27 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s'，\n" "但是没有获取到这个引用。" -#: builtin/pull.c:820 +#: builtin/pull.c:754 msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:867 +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" -#: builtin/pull.c:875 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:903 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "变基式拉取" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "请提交或为它们保存进度。" + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9796,7 +10479,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:908 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9813,11 +10496,11 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:923 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:927 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" @@ -10179,15 +10862,60 @@ msgstr "跳过应用稀疏检出过滤器" msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1843 +#: builtin/receive-pack.c:793 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set 'receive.denyCurrentBranch' configuration variable to\n" +"'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" +"默认禁止更新非纯仓库的当前分支，因为您推送的内容将导致索引和工作区\n" +"不一致，并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" +"\n" +"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" +"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做，除非您\n" +"用某种方式将其工作区更新至您推送的状态。\n" +"\n" +"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" +"配置变量为 'refuse'。" + +#: builtin/receive-pack.c:813 +msgid "" +"By default, deleting the current branch is denied, because the next\n" +"'git clone' won't result in any file checked out, causing confusion.\n" +"\n" +"You can set 'receive.denyDeleteCurrent' configuration variable to\n" +"'warn' or 'ignore' in the remote repository to allow deleting the\n" +"current branch, with or without a warning message.\n" +"\n" +"To squelch this message, you can set it to 'refuse'." +msgstr "" +"默认禁止删除当前分支，因为下一次 'git clone' 将不会检出任何文件，\n" +"导致混淆。\n" +"\n" +"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" +"'warn' 或 'ignore' 以允许删除当前分支，显示或者不显示警告。\n" +"\n" +"若要屏蔽此信息，您可以设置它为 'refuse'。" + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:1857 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "您必须指定一个目录。" @@ -10511,7 +11239,7 @@ msgstr "* 远程 %s" msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(无 URL)" @@ -10550,7 +11278,7 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1179 builtin/remote.c:1206 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" msgstr "（状态未查询）" @@ -10564,140 +11292,145 @@ msgstr[1] " 为 'git pull' 配置的本地分支：" msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1203 +#: builtin/remote.c:1202 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" -#: builtin/remote.c:1224 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1226 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1241 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1243 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1253 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1282 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为摇摆状态！" -#: builtin/remote.c:1292 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1293 +#: builtin/remote.c:1292 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1309 +#: builtin/remote.c:1308 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 +#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1436 +#: builtin/remote.c:1435 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1443 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1460 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "查询推送 URL 地址，而非获取 URL 地址" -#: builtin/remote.c:1462 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "返回所有 URL 地址" -#: builtin/remote.c:1490 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1518 +#: builtin/remote.c:1517 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1520 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1527 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1568 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧 URL 匹配模版：%s" -#: builtin/remote.c:1576 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1578 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送 URL 地址" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子命令：%s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<选项>]" @@ -10881,8 +11614,8 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <树或提交> [--] <路径>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<树或提交>] [--] <路径>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -11003,27 +11736,27 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:362 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:527 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11114,7 +11847,7 @@ msgstr "保持多余的、空的提交" msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:207 +#: builtin/revert.c:205 msgid "cherry-pick failed" msgstr "拣选失败" @@ -11275,70 +12008,124 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:375 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "忽略 %s，无法处理 %d 个以上的引用" +msgstr[1] "忽略 %s，无法处理 %d 个以上的引用" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "没有和 %s 匹配的引用" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "着色 '*!+-' 到相应的分支" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "显示共同祖先后的 <n> 个提交" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "和 more=-1 同义" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "不显示字符串命名" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "包括当前分支" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "以对象名字命名提交" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "显示可能合并的基线" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "未提供分支，且 HEAD 无效" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "选项 --reflog 需要一个分支名" + +#: builtin/show-branch.c:733 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "一次只能显示 %d 个条目。" +msgstr[1] "一次只能显示 %d 个条目。" + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "无此引用 %s" + +#: builtin/show-branch.c:829 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "不能处理 %d 个以上的版本。" +msgstr[1] "不能处理 %d 个以上的版本。" + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "'%s' 不是一个有效的引用。" + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "不能找到提交 %s (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -11399,12 +12186,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 "没有这样的引用：%s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" @@ -11414,75 +12201,94 @@ msgstr "期望一个完整的引用名称，却得到 %s" msgid "cannot strip one component off url '%s'" msgstr "无法从 url '%s' 剥离一个组件" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 -#: builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 +#: builtin/submodule--helper.c:590 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 +#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" -#: builtin/submodule--helper.c:364 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "无法为子模组 '%s' 注册 url" -#: builtin/submodule--helper.c:368 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" # -#: builtin/submodule--helper.c:378 +#: builtin/submodule--helper.c:383 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" -#: builtin/submodule--helper.c:385 +#: builtin/submodule--helper.c:390 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "无法为子模组 '%s' 注册更新模式" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "初始化子模组时抑制输出" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<路径>]" -#: builtin/submodule--helper.c:430 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "子模组 '%s' 不能添加仓库备选：%s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:504 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "显示克隆进度" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11490,108 +12296,108 @@ msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" -#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 +#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "无法克隆 '%s' 到子模组路径 '%s'" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "无法关闭文件 %s" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:641 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:662 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:792 +#: builtin/submodule--helper.c:913 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:803 +#: builtin/submodule--helper.c:924 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:831 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:838 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:840 +#: builtin/submodule--helper.c:961 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:841 +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:846 +#: builtin/submodule--helper.c:969 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:927 +#: builtin/submodule--helper.c:1050 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "submodule-helper 子命令必须由另外的子命令调用" -#: builtin/submodule--helper.c:984 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -11825,7 +12631,7 @@ msgstr "标签 '%s' 已存在" msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "展开对象中" @@ -11887,131 +12693,147 @@ 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 [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "启用/禁用对未跟踪文件的缓存" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是否支持未跟踪文件缓存" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "无需检测文件系统，启用对未跟踪文件的缓存" -#: builtin/update-index.c:1134 +#: builtin/update-index.c:1119 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" +"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修" +"改它。" + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" msgstr "缓存未跟踪文件被禁用" -#: builtin/update-index.c:1146 +#: builtin/update-index.c:1131 +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "" +"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或" +"修改它。" + +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓存未跟踪文件在 '%s' 启用" @@ -12208,26 +13030,38 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" -#: upload-pack.c:20 +#: upload-pack.c:22 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<选项>] <目录>" -#: upload-pack.c:837 +#: upload-pack.c:1028 msgid "quit after a single request/response exchange" msgstr "在一次单独的请求/响应（request/response）交换后退出" -#: 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 "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" -#: upload-pack.c:843 +#: upload-pack.c:1034 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活动 <n> 秒钟后终止传输" +#: 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 "" +"您 socket 目录权限过于放松，其他用户可能会读取您缓存的认证信息。考虑执行：\n" +"\n" +"\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "调试信息输出到标准错误" @@ -12242,7 +13076,11 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" "帮助。" -#: http.c:323 +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "当 cURL < 7.22.0 时，不支持委托控制" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" @@ -12358,15 +13196,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 "用 <n> 位数字显示 SHA-1 哈希值" @@ -12582,7 +13420,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 @@ -12765,6 +13603,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 "无法保存当前工作区状态" @@ -12805,6 +13647,10 @@ msgstr "" "错误：'stash save' 的未知选项：$option\n" " 要提供一个描述信息，使用 git stash save -- '$option'" +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" + #: git-stash.sh:259 msgid "No local changes to save" msgstr "没有要保存的本地修改" @@ -12826,96 +13672,100 @@ msgstr "保存工作目录和索引状态 $stash_msg" msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: git-stash.sh:404 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" -#: git-stash.sh:414 +#: git-stash.sh:416 msgid "No stash found." msgstr "未发现 stash。" -#: git-stash.sh:421 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:427 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一个有效的引用" -#: git-stash.sh:455 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是 stash 样提交" -#: git-stash.sh:466 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个 stash 引用" -#: git-stash.sh:474 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:478 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程中恢复进度" -#: git-stash.sh:486 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:488 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:522 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "无法从进度保存中恢复未跟踪文件" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "无法将修改的文件取消暂存" -#: git-stash.sh:537 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:551 +#: git-stash.sh:562 msgid "The stash is kept in case you need it again." msgstr "暂存被保留以备您再次需要。" -#: git-stash.sh:560 +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:561 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:569 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:641 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:183 +#: git-submodule.sh:184 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:193 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:210 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:214 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12926,22 +13776,22 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:232 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:234 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:242 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: 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" @@ -12956,47 +13806,47 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:262 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:267 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:276 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:323 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "正在进入 '$displaypath'" -#: git-submodule.sh:343 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "停止于 '$displaypath'；脚本返回非零值。" -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "pathspec 和 --all 不兼容" -#: git-submodule.sh:419 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: git-submodule.sh:439 +#: git-submodule.sh:440 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13005,144 +13855,141 @@ msgstr "" "子模组工作区 '$displaypath' 包含一个 .git 目录\n" "（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）" -#: git-submodule.sh:447 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们" -#: git-submodule.sh:450 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:451 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "无法移除子模组工作区 '$displaypath'" -#: git-submodule.sh:454 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "不能创建空的子模组目录 '$displaypath'" -#: git-submodule.sh:463 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:622 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:627 +#: git-submodule.sh:632 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" -#: git-submodule.sh:645 +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中获取" -#: git-submodule.sh:651 +#: git-submodule.sh:656 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." -msgstr "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" +msgstr "" +"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:658 +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:659 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:664 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:669 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:670 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:675 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:676 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:707 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:815 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:867 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:887 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:890 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:893 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:918 -msgid "blob" -msgstr "数据对象" - -#: git-submodule.sh:1040 +#: git-submodule.sh:1045 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:1107 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' 同步子模组 url" @@ -13188,13 +14035,17 @@ msgstr "" msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" +msgstr "" +"\n" +"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" #: git-rebase--interactive.sh:166 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "\n如果您在这里删除一行，对应的提交将会丢失。\n" +msgstr "" +"\n" +"如果您在这里删除一行，对应的提交将会丢失。\n" #: git-rebase--interactive.sh:202 #, sh-format @@ -13425,8 +14276,12 @@ msgid "" msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" #: git-rebase--interactive.sh:1044 -msgid "You can fix this with 'git rebase --edit-todo'." -msgstr "您可以使用 'git rebase --edit-todo' 命令修改。" +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "" +"您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --" +"continue'。" #: git-rebase--interactive.sh:1045 msgid "Or you can abort the rebase with 'git rebase --abort'." @@ -13449,7 +14304,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 "" @@ -13473,7 +14328,8 @@ msgstr "在修补提交中查找作者信息时遇到错误" msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." -msgstr "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" +msgstr "" +"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 msgid "Could not commit staged changes." @@ -13493,51 +14349,50 @@ 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 "无法运行编辑器" -#: 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 "不能检出 $switch_to" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1155 msgid "No HEAD?" msgstr "没有 HEAD？" -#: git-rebase--interactive.sh:1159 +#: git-rebase--interactive.sh:1156 #, sh-format msgid "Could not create temporary $state_dir" msgstr "不能创建临时 $state_dir" -#: 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] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" -#: 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 "\n然而，如果您删除全部内容，变基操作将会终止。\n\n" +msgstr "" +"\n" +"然而，如果您删除全部内容，变基操作将会终止。\n" +"\n" -#: git-rebase--interactive.sh:1288 +#: git-rebase--interactive.sh:1285 msgid "Note that empty commits are commented out" msgstr "注意空提交已被注释掉" @@ -13564,6 +14419,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." @@ -13573,11 +14432,19 @@ msgstr "不能 $action：您有未暂存的变更。" msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "不能变基：您的索引中包含未提交的变更。" +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。" + #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "不能 $action：您的索引中包含未提交的变更。" +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "而且您的索引中包含未提交的变更。" + #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "您需要在工作区的顶级目录中运行这个命令。" @@ -13585,3 +14452,39 @@ msgstr "您需要在工作区的顶级目录中运行这个命令。" #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" msgstr "不能确定 git 目录的绝对路径" + +#~ msgid "Could not write to %s" +#~ msgstr "不能写入 %s" + +#~ msgid "Error wrapping up %s." +#~ msgstr "错误收尾 %s。" + +#~ msgid "Your local changes would be overwritten by cherry-pick." +#~ msgstr "您的本地修改将被拣选操作覆盖。" + +#~ msgid "Cannot revert during another revert." +#~ msgstr "不能在回退中执行另一回退。" + +#~ msgid "Cannot cherry-pick during another cherry-pick." +#~ msgstr "不能在拣选过程中执行另一拣选。" + +#~ msgid "Could not parse line %d." +#~ msgstr "不能解析第 %d 行。" + +#~ msgid "Could not open %s" +#~ msgstr "不能打开 %s" + +#~ msgid "Could not read %s." +#~ msgstr "不能读取 %s。" + +#~ msgid "Could not format %s." +#~ msgstr "不能格式化 %s。" + +#~ msgid "%s: %s" +#~ msgstr "%s：%s" + +#~ msgid "cannot open %s: %s" +#~ msgstr "不能打开 %s：%s" + +#~ msgid "You need to set your committer info first" +#~ msgstr "您需要先设置您的提交者信息" diff --git a/ref-filter.c b/ref-filter.c index d4c2931..f5f7a70 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1017,7 +1017,7 @@ static void populate_value(struct ref_array_item *ref) head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, sha1, NULL); - if (!strcmp(ref->refname, head)) + if (head && !strcmp(ref->refname, head)) v->s = "*"; else v->s = " "; diff --git a/sequencer.c b/sequencer.c index 6f0ff9e..30b10ba 100644 --- a/sequencer.c +++ b/sequencer.c @@ -248,7 +248,7 @@ static int write_message(const void *buf, size_t len, const char *filename, } if (append_eol && write(msg_fd, "\n", 1) < 0) { rollback_lock_file(&msg_file); - return error_errno(_("could not write eol to '%s"), filename); + return error_errno(_("could not write eol to '%s'"), filename); } if (commit_lock_file(&msg_file) < 0) { rollback_lock_file(&msg_file); diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh index 29e91d8..bbf3e39 100755 --- a/t/t0030-stripspace.sh +++ b/t/t0030-stripspace.sh @@ -432,6 +432,15 @@ test_expect_success '-c with changed comment char' ' test_cmp expect actual ' +test_expect_success '-c with comment char defined in .git/config' ' + test_config core.commentchar = && + printf "= foo\n" >expect && + printf "foo" | ( + mkdir sub && cd sub && git stripspace -c + ) >actual && + test_cmp expect actual +' + test_expect_success 'avoid SP-HT sequence in commented line' ' printf "#\tone\n#\n# two\n" >expect && printf "\tone\n\ntwo\n" | git stripspace -c >actual && diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index e38e296..c896a4c 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -976,6 +976,17 @@ test_expect_success 'rebase -i respects core.commentchar' ' test B = $(git cat-file commit HEAD^ | sed -ne \$p) ' +test_expect_success 'rebase -i respects core.commentchar=auto' ' + test_config core.commentchar auto && + write_script copy-edit-script.sh <<-\EOF && + cp "$1" edit-script + EOF + test_set_editor "$(pwd)/copy-edit-script.sh" && + test_when_finished "git rebase --abort || :" && + git rebase -i HEAD^ && + test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)" +' + test_expect_success 'rebase -i, with <onto> and <upstream> specified as :/quuxery' ' test_when_finished "git branch -D torebase" && git checkout -b torebase branch1 && diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 19a2823..039509a 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -553,4 +553,14 @@ test_expect_success 'Verify sort with multiple keys' ' refs/tags/bogo refs/tags/master > actual && test_cmp expected actual ' + +test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' ' + test_when_finished "git checkout master" && + git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual && + sed -e "s/^\* / /" actual >expect && + git checkout --orphan HEAD && + git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual && + test_cmp expect actual +' + test_done |