mirror of
https://github.com/git/git.git
synced 2024-05-10 14:16:07 +02:00
l10n: Fixed typo of git fetch-pack command
Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed the affected translations all in one batch. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
c091ffbe8e
commit
275588f93e
185
po/fr.po
185
po/fr.po
|
|
@ -73,8 +73,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2016-11-01 21:35+0800\n"
|
||||
"PO-Revision-Date: 2016-11-06 20:21+0100\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"
|
||||
|
|
@ -269,7 +269,8 @@ msgstr[1] ""
|
|||
#: 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)"
|
||||
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"
|
||||
|
|
@ -358,18 +359,22 @@ 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"
|
||||
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"
|
||||
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."
|
||||
msgstr ""
|
||||
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
|
||||
|
||||
#: apply.c:3162
|
||||
#, c-format
|
||||
|
|
@ -430,7 +435,9 @@ 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."
|
||||
msgstr ""
|
||||
"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
|
||||
"points."
|
||||
|
||||
#: apply.c:3557
|
||||
#, c-format
|
||||
|
|
@ -515,7 +522,8 @@ 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"
|
||||
msgstr ""
|
||||
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
|
||||
|
||||
#: apply.c:4082
|
||||
#, c-format
|
||||
|
|
@ -835,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: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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -1162,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"
|
||||
|
|
@ -1289,8 +1297,10 @@ msgid ""
|
|||
"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"
|
||||
"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"
|
||||
|
|
@ -1469,7 +1479,8 @@ msgid ""
|
|||
"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."
|
||||
"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
|
||||
"travail."
|
||||
|
||||
#: convert.c:205
|
||||
#, c-format
|
||||
|
|
@ -1483,7 +1494,8 @@ msgid ""
|
|||
"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."
|
||||
"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
|
||||
"travail."
|
||||
|
||||
#: convert.c:215
|
||||
#, c-format
|
||||
|
|
@ -1563,7 +1575,7 @@ 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"
|
||||
|
||||
|
|
@ -1627,17 +1639,23 @@ msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
|
|||
|
||||
#: 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."
|
||||
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."
|
||||
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."
|
||||
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"
|
||||
|
|
@ -1657,7 +1675,7 @@ 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'"
|
||||
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
||||
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
|
||||
|
||||
#: fetch-pack.c:295
|
||||
|
|
@ -2214,7 +2232,8 @@ msgid ""
|
|||
"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."
|
||||
"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
|
||||
|
|
@ -2341,7 +2360,10 @@ msgstr ""
|
|||
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"
|
||||
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
|
||||
|
|
@ -2838,7 +2860,9 @@ msgstr "le commit %s n'a pas de parent %d"
|
|||
#: sequencer.c:687
|
||||
#, c-format
|
||||
msgid "mainline was specified but commit %s is not a merge."
|
||||
msgstr "une branche principale a été spécifiée mais le commit %s n'est pas une fusion."
|
||||
msgstr ""
|
||||
"une branche principale a été spécifiée mais le commit %s n'est pas une "
|
||||
"fusion."
|
||||
|
||||
#. TRANSLATORS: The first %s will be a "todo" command like
|
||||
#. "revert" or "pick", the second %s a SHA1.
|
||||
|
|
@ -3111,7 +3135,7 @@ msgstr "le SHA1 court %s est ambigu"
|
|||
msgid "The candidates are:"
|
||||
msgstr "Les candidats sont :"
|
||||
|
||||
#: sha1_name.c:577
|
||||
#: 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"
|
||||
|
|
@ -3503,7 +3527,8 @@ msgid ""
|
|||
"update:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par l'extraction creuse :\n"
|
||||
"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
|
||||
"jour par l'extraction creuse :\n"
|
||||
"%s"
|
||||
|
||||
#: unpack-trees.c:128
|
||||
|
|
@ -3513,7 +3538,8 @@ msgid ""
|
|||
"update:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"
|
||||
"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
|
||||
"à jour par extraction creuse :\n"
|
||||
"%s"
|
||||
|
||||
#: unpack-trees.c:205
|
||||
|
|
@ -4528,10 +4554,10 @@ msgid "pass it through git-apply"
|
|||
msgstr "le passer jusqu'à git-apply"
|
||||
|
||||
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
|
||||
#: builtin/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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -4751,11 +4777,15 @@ msgstr "Ignorer les différences d'espace"
|
|||
|
||||
#: 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"
|
||||
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"
|
||||
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"
|
||||
|
|
@ -4794,7 +4824,9 @@ msgstr ""
|
|||
|
||||
#: 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"
|
||||
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"
|
||||
|
|
@ -4816,12 +4848,16 @@ 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"
|
||||
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"
|
||||
msgstr ""
|
||||
"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
|
||||
"premier parent"
|
||||
|
||||
#: builtin/blame.c:2843
|
||||
#, c-format
|
||||
|
|
@ -5298,13 +5334,17 @@ msgstr "Le dépaquetage d'un colis requiert un dépôt."
|
|||
msgid ""
|
||||
"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 | --filters) [--path=<chemin>] <objet>"
|
||||
msgstr ""
|
||||
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
|
||||
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
|
||||
|
||||
#: 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]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
||||
"filters]"
|
||||
|
||||
#: builtin/cat-file.c:551
|
||||
msgid "<type> can be one of: blob, tree, commit, tag"
|
||||
|
|
@ -6077,7 +6117,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
|
|||
msgid "path to git-upload-pack on the remote"
|
||||
msgstr "chemin vers git-upload-pack sur le serveur distant"
|
||||
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
|
||||
#: builtin/pull.c:202
|
||||
msgid "depth"
|
||||
msgstr "profondeur"
|
||||
|
||||
|
|
@ -6100,7 +6141,8 @@ 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"
|
||||
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"
|
||||
|
|
@ -6286,7 +6328,9 @@ msgstr "Clonage dans '%s'...\n"
|
|||
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"
|
||||
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."
|
||||
|
|
@ -6295,11 +6339,15 @@ msgstr ""
|
|||
|
||||
#: 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://\"."
|
||||
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://\"."
|
||||
msgstr ""
|
||||
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
|
||||
"\"file://\"."
|
||||
|
||||
#: builtin/clone.c:1026
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
|
|
@ -6435,7 +6483,8 @@ msgid ""
|
|||
" git commit --allow-empty\n"
|
||||
"\n"
|
||||
msgstr ""
|
||||
"Le picorage précédent est à présent vide, vraisemblablement dû à une résolution de conflit.\n"
|
||||
"Le picorage précédent est à présent vide, vraisemblablement dû à une "
|
||||
"résolution de conflit.\n"
|
||||
"Si vous souhaitez tout de même le valider, utilisez :\n"
|
||||
"\n"
|
||||
" git commit --allow-empty\n"
|
||||
|
|
@ -6955,7 +7004,7 @@ 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:1754
|
||||
#, c-format, fuzzy
|
||||
#, fuzzy, c-format
|
||||
msgid "Aborting commit due to empty commit message.\n"
|
||||
msgstr "Abandon de la validation dû à un message de validation vide\n"
|
||||
|
||||
|
|
@ -10251,7 +10300,8 @@ msgstr "une fusion de notes dans %s est déjà en cours avec %s"
|
|||
#: builtin/notes.c:863
|
||||
#, c-format
|
||||
msgid "failed to store link to current notes ref (%s)"
|
||||
msgstr "impossible de stocker le lien vers la référence actuelle aux notes (%s)"
|
||||
msgstr ""
|
||||
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
|
||||
|
||||
#: builtin/notes.c:865
|
||||
#, c-format
|
||||
|
|
@ -12365,7 +12415,9 @@ msgstr ""
|
|||
#: 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"
|
||||
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"
|
||||
|
|
@ -12551,7 +12603,8 @@ 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"
|
||||
msgstr ""
|
||||
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
|
||||
|
||||
#: builtin/submodule--helper.c:570
|
||||
#, c-format
|
||||
|
|
@ -13127,7 +13180,9 @@ msgstr "activer le cache de non-suivis sans tester le système de fichier"
|
|||
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"
|
||||
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"
|
||||
|
|
@ -13137,7 +13192,9 @@ msgstr "Le cache non suivi est désactivé"
|
|||
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"
|
||||
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
|
||||
|
|
@ -13987,7 +14044,8 @@ msgstr ""
|
|||
|
||||
#: 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"
|
||||
msgstr ""
|
||||
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
|
||||
|
||||
#: git-stash.sh:259
|
||||
msgid "No local changes to save"
|
||||
|
|
@ -14516,9 +14574,12 @@ msgid ""
|
|||
"before\n"
|
||||
"you are able to reword the commit."
|
||||
msgstr ""
|
||||
"Impossible de corriger le commit après avoir réussi à picorer $sha1... $rest\n"
|
||||
"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"
|
||||
"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
|
||||
"$rest\n"
|
||||
"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"
|
||||
"problème avant de pouvoir reformuler le message du commit."
|
||||
|
||||
#: git-rebase--interactive.sh:564
|
||||
|
|
@ -14647,7 +14708,9 @@ msgstr ""
|
|||
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'."
|
||||
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'."
|
||||
|
|
|
|||
105
po/ko.po
105
po/ko.po
|
|
@ -58,8 +58,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2016-11-01 21:35+0800\n"
|
||||
"PO-Revision-Date: 2016-11-03 19:47+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"
|
||||
|
|
@ -332,12 +332,14 @@ msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
|
|||
#: apply.c:3098
|
||||
#, c-format
|
||||
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
||||
msgstr "반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
|
||||
msgstr ""
|
||||
"반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
|
||||
|
||||
#: apply.c:3144
|
||||
#, c-format
|
||||
msgid "cannot apply binary patch to '%s' without full index line"
|
||||
msgstr "전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
|
||||
msgstr ""
|
||||
"전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
|
||||
|
||||
#: apply.c:3154
|
||||
#, c-format
|
||||
|
|
@ -796,11 +798,11 @@ msgstr "접두어"
|
|||
msgid "prepend prefix to each pathname in the archive"
|
||||
msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
|
||||
|
||||
#: 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
|
||||
#: 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 "파일"
|
||||
|
||||
|
|
@ -1115,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의 헤드가 업데이트되지 않았습니다"
|
||||
|
|
@ -1492,7 +1494,7 @@ 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 "부정확한 이름 바꾸기 탐색을 수행하는 중"
|
||||
|
||||
|
|
@ -1532,7 +1534,8 @@ msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤"
|
|||
|
||||
#: diff.c:3412
|
||||
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
||||
msgstr "\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
|
||||
msgstr ""
|
||||
"\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
|
||||
|
||||
#: diff.c:3502
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
|
|
@ -1584,8 +1587,8 @@ 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'을(를) 받았습니다"
|
||||
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"
|
||||
|
|
@ -2258,7 +2261,9 @@ msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니
|
|||
msgid ""
|
||||
"empty strings as pathspecs will be made invalid in upcoming releases. please "
|
||||
"use . instead if you meant to match all paths"
|
||||
msgstr "경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모든 경로를 지정하려면 점(.)을 사용하십시오."
|
||||
msgstr ""
|
||||
"경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모"
|
||||
"든 경로를 지정하려면 점(.)을 사용하십시오."
|
||||
|
||||
#: pathspec.c:440
|
||||
#, c-format
|
||||
|
|
@ -3012,7 +3017,7 @@ msgstr "짧은 SHA1 %s은(는) 여럿에 대응됩니다"
|
|||
msgid "The candidates are:"
|
||||
msgstr "후보는 다음과 같습니다:"
|
||||
|
||||
#: sha1_name.c:577
|
||||
#: 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"
|
||||
|
|
@ -4388,10 +4393,10 @@ msgid "pass it through git-apply"
|
|||
msgstr "git-apply에 넘깁니다"
|
||||
|
||||
#: 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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -4646,7 +4651,8 @@ msgstr "n,m줄 (1번 줄부터 시작) 사이의 범위만 처리"
|
|||
|
||||
#: builtin/blame.c:2654
|
||||
msgid "--progress can't be used with --incremental or porcelain formats"
|
||||
msgstr "--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다"
|
||||
msgstr ""
|
||||
"--progress 옵션은 --incremental 옵션이나 포스레인 형식에서 사용할 수 없습니다"
|
||||
|
||||
#. TRANSLATORS: This string is used to tell us the maximum
|
||||
#. display width for a relative timestamp in "git blame"
|
||||
|
|
@ -4668,12 +4674,15 @@ msgstr "--contents 옵션을 마지막 오브젝트 이름에 사용할 수 없
|
|||
|
||||
#: builtin/blame.c:2805
|
||||
msgid "--reverse and --first-parent together require specified latest commit"
|
||||
msgstr "--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
|
||||
msgstr ""
|
||||
"--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
|
||||
|
||||
#: builtin/blame.c:2832
|
||||
msgid ""
|
||||
"--reverse --first-parent together require range along first-parent chain"
|
||||
msgstr "--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니다"
|
||||
msgstr ""
|
||||
"--reverse 및 --first-parent 옵션을 같이 쓰면 최초-상위 체인과 범위가 필요합니"
|
||||
"다"
|
||||
|
||||
#: builtin/blame.c:2843
|
||||
#, c-format
|
||||
|
|
@ -5145,13 +5154,17 @@ msgstr "번들을 해제하려면 저장소가 필요합니다."
|
|||
msgid ""
|
||||
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
||||
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
|
||||
msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
|
||||
msgstr ""
|
||||
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
||||
"p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
|
||||
|
||||
#: 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]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
||||
"filters]"
|
||||
|
||||
#: builtin/cat-file.c:551
|
||||
msgid "<type> can be one of: blob, tree, commit, tag"
|
||||
|
|
@ -5902,7 +5915,8 @@ msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다"
|
|||
msgid "path to git-upload-pack on the remote"
|
||||
msgstr "리모트의 git-upload-pack 경로"
|
||||
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
|
||||
#: builtin/pull.c:202
|
||||
msgid "depth"
|
||||
msgstr "깊이"
|
||||
|
||||
|
|
@ -6108,7 +6122,9 @@ msgstr "'%s'에 복제합니다...\n"
|
|||
msgid ""
|
||||
"clone --recursive is not compatible with both --reference and --reference-if-"
|
||||
"able"
|
||||
msgstr "clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 것과 호환되지 않습니다"
|
||||
msgstr ""
|
||||
"clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 "
|
||||
"것과 호환되지 않습니다"
|
||||
|
||||
#: builtin/clone.c:1019
|
||||
msgid "--depth is ignored in local clones; use file:// instead."
|
||||
|
|
@ -6117,11 +6133,15 @@ msgstr ""
|
|||
|
||||
#: builtin/clone.c:1021
|
||||
msgid "--shallow-since is ignored in local clones; use file:// instead."
|
||||
msgstr "--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
|
||||
msgstr ""
|
||||
"--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십"
|
||||
"시오."
|
||||
|
||||
#: builtin/clone.c:1023
|
||||
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
|
||||
msgstr "--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
|
||||
msgstr ""
|
||||
"--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하"
|
||||
"십시오."
|
||||
|
||||
#: builtin/clone.c:1026
|
||||
msgid "source repository is shallow, ignoring --local"
|
||||
|
|
@ -12038,7 +12058,9 @@ 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 옵션과 호환되지 않습니다"
|
||||
msgstr ""
|
||||
"--reflog 옵션은 --all, --remotes, --independent, --merge-base 옵션과 호환되"
|
||||
"지 않습니다"
|
||||
|
||||
#: builtin/show-branch.c:727
|
||||
msgid "no branches given, and HEAD is not valid"
|
||||
|
|
@ -12769,7 +12791,9 @@ msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합
|
|||
msgid ""
|
||||
"core.untrackedCache is set to true; remove or change it, if you really want "
|
||||
"to disable the untracked cache"
|
||||
msgstr "core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 않으려면 이 값을 제거하거나 바꾸십시오."
|
||||
msgstr ""
|
||||
"core.untrackedCache값이 참입니다. 정말로 추적하지 않는 파일 캐시를 사용하지 "
|
||||
"않으려면 이 값을 제거하거나 바꾸십시오."
|
||||
|
||||
#: builtin/update-index.c:1123
|
||||
msgid "Untracked cache disabled"
|
||||
|
|
@ -12779,7 +12803,9 @@ msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다"
|
|||
msgid ""
|
||||
"core.untrackedCache is set to false; remove or change it, if you really want "
|
||||
"to enable the untracked cache"
|
||||
msgstr "core.untrackedCache값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려면 이 값을 제거하거나 바꾸십시오."
|
||||
msgstr ""
|
||||
"core.untrackedCache값이 거짓입니다. 정말로 추적하지 않는 파일 캐시를 사용하려"
|
||||
"면 이 값을 제거하거나 바꾸십시오."
|
||||
|
||||
#: builtin/update-index.c:1135
|
||||
#, c-format
|
||||
|
|
@ -13603,7 +13629,8 @@ msgstr ""
|
|||
|
||||
#: git-stash.sh:251
|
||||
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
||||
msgstr "--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
|
||||
msgstr ""
|
||||
"--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
|
||||
|
||||
#: git-stash.sh:259
|
||||
msgid "No local changes to save"
|
||||
|
|
@ -14241,7 +14268,9 @@ msgstr ""
|
|||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
"continue'."
|
||||
msgstr "'git rebase --edit-todo' 명령으로 바로잡을 수 있고 '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'."
|
||||
|
|
|
|||
70
po/pt_PT.po
70
po/pt_PT.po
|
|
@ -9,7 +9,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2016-11-01 21:35+0800\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"
|
||||
|
|
@ -767,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: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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -1086,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"
|
||||
|
|
@ -1386,8 +1386,7 @@ msgid ""
|
|||
"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."
|
||||
"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
|
||||
|
||||
#: convert.c:205
|
||||
#, c-format
|
||||
|
|
@ -1401,8 +1400,7 @@ msgid ""
|
|||
"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."
|
||||
"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
|
||||
|
||||
#: convert.c:215
|
||||
#, c-format
|
||||
|
|
@ -1482,7 +1480,7 @@ 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"
|
||||
|
||||
|
|
@ -1579,7 +1577,7 @@ 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'"
|
||||
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
||||
msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
|
||||
|
||||
#: fetch-pack.c:295
|
||||
|
|
@ -1587,12 +1585,12 @@ msgid "--stateless-rpc requires multi_ack_detailed"
|
|||
msgstr "--stateless-rpc requer multi_ack_detailed"
|
||||
|
||||
#: fetch-pack.c:381
|
||||
#, c-format, fuzzy
|
||||
#, fuzzy, c-format
|
||||
msgid "invalid shallow line: %s"
|
||||
msgstr "linha rasa inválida: %s"
|
||||
|
||||
#: fetch-pack.c:387
|
||||
#, c-format, fuzzy
|
||||
#, fuzzy, c-format
|
||||
msgid "invalid unshallow line: %s"
|
||||
msgstr "linha para aprofundar inválida: %s"
|
||||
|
||||
|
|
@ -1607,12 +1605,12 @@ msgid "error in object: %s"
|
|||
msgstr "erro no objeto: %s"
|
||||
|
||||
#: fetch-pack.c:394
|
||||
#, c-format, fuzzy
|
||||
#, fuzzy, c-format
|
||||
msgid "no shallow found: %s"
|
||||
msgstr "raso não encontrado: %s"
|
||||
|
||||
#: fetch-pack.c:397
|
||||
#, c-format, fuzzy
|
||||
#, fuzzy, c-format
|
||||
msgid "expected shallow/unshallow, got %s"
|
||||
msgstr "esperava-se raso/aprofundar, obteve-se %s"
|
||||
|
||||
|
|
@ -2136,9 +2134,8 @@ msgid ""
|
|||
"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."
|
||||
"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
|
||||
|
|
@ -3037,7 +3034,7 @@ msgstr "SHA1 curto %s é ambíguo"
|
|||
msgid "The candidates are:"
|
||||
msgstr "Os candidatos são:"
|
||||
|
||||
#: sha1_name.c:577
|
||||
#: 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"
|
||||
|
|
@ -4462,10 +4459,10 @@ msgid "pass it through git-apply"
|
|||
msgstr "transmitir ao git-apply"
|
||||
|
||||
#: 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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -5230,16 +5227,16 @@ msgid ""
|
|||
"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 | --filters) [--path=<caminho>] <objeto>"
|
||||
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
||||
"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
|
||||
|
||||
#: 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]"
|
||||
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
||||
"filters]"
|
||||
|
||||
#: builtin/cat-file.c:551
|
||||
msgid "<type> can be one of: blob, tree, commit, tag"
|
||||
|
|
@ -6005,7 +6002,8 @@ msgstr "extrair <ramo> em vez da HEAD do remoto"
|
|||
msgid "path to git-upload-pack on the remote"
|
||||
msgstr "caminho para git-upload-pack no remoto"
|
||||
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
|
||||
#: builtin/pull.c:202
|
||||
msgid "depth"
|
||||
msgstr "profundidade"
|
||||
|
||||
|
|
@ -14490,8 +14488,8 @@ 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'."
|
||||
"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'."
|
||||
|
|
|
|||
22
po/sv.po
22
po/sv.po
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git 2.11.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2016-11-01 21:35+0800\n"
|
||||
"PO-Revision-Date: 2016-11-05 16:01+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"
|
||||
|
|
@ -1087,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"
|
||||
|
|
@ -1484,7 +1484,7 @@ 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"
|
||||
|
||||
|
|
@ -1578,8 +1578,8 @@ 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\""
|
||||
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"
|
||||
|
|
@ -3021,7 +3021,7 @@ msgstr "kort SHA1 %s är tvetydig"
|
|||
msgid "The candidates are:"
|
||||
msgstr "Kandidaterna är:"
|
||||
|
||||
#: sha1_name.c:577
|
||||
#: 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"
|
||||
|
|
|
|||
43
po/vi.po
43
po/vi.po
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git v2.11.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2016-11-01 21:35+0800\n"
|
||||
"PO-Revision-Date: 2016-11-04 08:07+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"
|
||||
|
|
@ -768,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: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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -1087,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"
|
||||
|
|
@ -1466,7 +1466,7 @@ 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"
|
||||
|
||||
|
|
@ -1562,8 +1562,8 @@ 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”"
|
||||
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"
|
||||
|
|
@ -3007,7 +3007,7 @@ msgstr "tóm lược SHA1 %s chưa rõ ràng"
|
|||
msgid "The candidates are:"
|
||||
msgstr "Các ứng cử là:"
|
||||
|
||||
#: sha1_name.c:577
|
||||
#: 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"
|
||||
|
|
@ -4440,10 +4440,10 @@ msgid "pass it through git-apply"
|
|||
msgstr "chuyển nó qua git-apply"
|
||||
|
||||
#: 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
|
||||
#: 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"
|
||||
|
||||
|
|
@ -5968,7 +5968,8 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
|
|||
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:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
|
||||
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
|
||||
#: builtin/pull.c:202
|
||||
msgid "depth"
|
||||
msgstr "độ-sâu"
|
||||
|
||||
|
|
|
|||
40
po/zh_CN.po
40
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-11-01 21:35+0800\n"
|
||||
"PO-Revision-Date: 2016-11-21 23:14+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"
|
||||
|
|
@ -1183,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 指向没有被更新"
|
||||
|
|
@ -1570,7 +1570,7 @@ 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 "正在进行非精确的重命名检测"
|
||||
|
||||
|
|
@ -1664,7 +1664,7 @@ msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
|
|||
|
||||
#: fetch-pack.c:243
|
||||
#, c-format
|
||||
msgid "git fetch_pack: expected ACK/NAK, got '%s'"
|
||||
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
||||
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
|
||||
|
||||
#: fetch-pack.c:295
|
||||
|
|
@ -2216,8 +2216,8 @@ msgid ""
|
|||
"commit/abort the previous merge before you start a new notes merge."
|
||||
msgstr ""
|
||||
"您尚未结束您前一次注释合并（存在 %s）。\n"
|
||||
"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 "
|
||||
"'git notes merge --abort' 来提交/终止前一次合并。"
|
||||
"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 'git "
|
||||
"notes merge --abort' 来提交/终止前一次合并。"
|
||||
|
||||
#: notes-merge.c:280
|
||||
#, c-format
|
||||
|
|
@ -3094,7 +3094,7 @@ msgstr "歧义的短 SHA1 %s"
|
|||
msgid "The candidates are:"
|
||||
msgstr "候选者有："
|
||||
|
||||
#: sha1_name.c:577
|
||||
#: 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"
|
||||
|
|
@ -5237,13 +5237,17 @@ msgstr "需要一个仓库来解包。"
|
|||
msgid ""
|
||||
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
||||
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
|
||||
msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
|
||||
msgstr ""
|
||||
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
||||
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
|
||||
|
||||
#: 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]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
||||
"filters]"
|
||||
|
||||
#: builtin/cat-file.c:551
|
||||
msgid "<type> can be one of: blob, tree, commit, tag"
|
||||
|
|
@ -12813,7 +12817,9 @@ msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
|
|||
msgid ""
|
||||
"core.untrackedCache is set to true; remove or change it, if you really want "
|
||||
"to disable the untracked cache"
|
||||
msgstr "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修改它。"
|
||||
msgstr ""
|
||||
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
|
||||
"改它。"
|
||||
|
||||
#: builtin/update-index.c:1123
|
||||
msgid "Untracked cache disabled"
|
||||
|
|
@ -12823,7 +12829,9 @@ msgstr "缓存未跟踪文件被禁用"
|
|||
msgid ""
|
||||
"core.untrackedCache is set to false; remove or change it, if you really want "
|
||||
"to enable the untracked cache"
|
||||
msgstr "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或修改它。"
|
||||
msgstr ""
|
||||
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
|
||||
"修改它。"
|
||||
|
||||
#: builtin/update-index.c:1135
|
||||
#, c-format
|
||||
|
|
|
|||
Loading…
Reference in New Issue