diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 7f18649ce71a9cdaae6f83115bf0c7bae228dfc9..4e6144993b64abb1d0500dd4e3bb283af9e3aff6 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Jean-No챘l Avila <jn.avila@free.fr>, 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2021-11-12 16:52+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.9.1-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2022-01-09 18:52+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.10.1\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31 @@ -10886,13 +10886,13 @@ msgstr "Les colis cr챕챕s en utilisant les exclusions de r챕vision sont des \"pa #: en/git-bundle.txt:58 #, priority:100 msgid "There is no option to create a \"thick pack\" when using revision exclusions, and users should not be concerned about the difference. By using \"thin packs\", bundles created using exclusions are smaller in size. That they're \"thin\" under the hood is merely noted here as a curiosity, and as a reference to other documentation." -msgstr "" +msgstr "Il n'y a pas d'option pour cr챕er un \"paquet 챕pais\" lors de l'utilisation des exclusions de r챕vision, et les utilisateurs ne doivent pas s'inqui챕ter de la diff챕rence. En utilisant des \"paquets minces\", les paquets cr챕챕s 횪 l'aide d'exclusions sont plus petits en taille. Le fait qu'ils soient \"minces\" sous le capot est simplement not챕 ici comme une curiosit챕, et comme une r챕f챕rence 횪 d'autres documents." #. type: Plain text #: en/git-bundle.txt:63 #, priority:100 msgid "See link:technical/bundle-format.html[the `bundle-format` documentation] for more details and the discussion of \"thin pack\" in link:technical/pack-format.html[the pack format documentation] for further details." -msgstr "" +msgstr "Voir link:technical/bundle-format.html[la documentation `bundle-format`] pour plus de d챕tails et la discussion sur le \"paquets fins\" dans link:technical/pack-format.html[la documentation sur le format du pack] pour plus de d챕tails." #. type: Labeled list #: en/git-bundle.txt:67 @@ -11018,25 +11018,25 @@ msgstr "SP횋CIFICATION DES R횋F횋RENCES" #: en/git-bundle.txt:149 #, priority:100 msgid "Revisions must be accompanied by reference names to be packaged in a bundle." -msgstr "" +msgstr "Les r챕visions doivent 챗tre accompagn챕es de noms de r챕f챕rence pour 챗tre regroup챕es dans un colis." #. type: Plain text #: en/git-bundle.txt:153 #, priority:100 msgid "More than one reference may be packaged, and more than one set of prerequisite objects can be specified. The objects packaged are those not contained in the union of the prerequisites." -msgstr "" +msgstr "Plus d'une r챕f챕rence peut 챗tre empaquet챕e, et plus d'un ensemble d'objets pr챕requis peut 챗tre sp챕cifi챕. Les objets empaquet챕s sont ceux qui ne sont pas contenus dans l'union des pr챕requis." #. type: Plain text #: en/git-bundle.txt:158 #, priority:100 msgid "The 'git bundle create' command resolves the reference names for you using the same rules as `git rev-parse --abbrev-ref=loose`. Each prerequisite can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)." -msgstr "" +msgstr "La commande 'git bundle create' r챕sout les noms de r챕f챕rence pour vous en utilisant les m챗mes r챔gles que `git rev-parse --abbrev-ref=loose`. Chaque pr챕-requis peut 챗tre sp챕cifi챕 explicitement (par exemple `^master~10`), ou implicitement (par exemple `master~10..master`, `--since=10.days.ago master`)." #. type: Plain text #: en/git-bundle.txt:161 #, priority:100 msgid "All of these simple cases are OK (assuming we have a \"master\" and \"next\" branch):" -msgstr "" +msgstr "Tous ces cas simples sont OK (en supposant que nous avons des branches \"master\" et \"next\") :" #. type: delimited block - #: en/git-bundle.txt:167 @@ -11046,13 +11046,13 @@ msgid "" "$ echo master | git bundle create master.bundle --stdin\n" "$ git bundle create master-and-next.bundle master next\n" "$ (echo master; echo next) | git bundle create master-and-next.bundle --stdin\n" -msgstr "" +msgstr "$ git bundle create master.bundle master\n$ echo master | git bundle create master.bundle --stdin\n$ git bundle create master-and-next.bundle master next\n$ (echo master; echo next) | git bundle create master-and-next.bundle --stdin\n" #. type: Plain text #: en/git-bundle.txt:170 #, priority:100 msgid "And so are these (and the same but omitted `--stdin` examples):" -msgstr "" +msgstr "Et il en est de m챗me pour ces exemples (et le m챗me mais avec `--stdin` omis) :" #. type: delimited block - #: en/git-bundle.txt:174 @@ -11060,13 +11060,13 @@ msgstr "" msgid "" "$ git bundle create recent-master.bundle master~10..master\n" "$ git bundle create recent-updates.bundle master~10..master next~5..next\n" -msgstr "" +msgstr "$ git bundle create recent-master.bundle master~10..master\n$ git bundle create recent-updates.bundle master~10..master next~5..next\n" #. type: Plain text #: en/git-bundle.txt:178 #, priority:100 msgid "A revision name or a range whose right-hand-side cannot be resolved to a reference is not accepted:" -msgstr "" +msgstr "Un nom de r챕vision ou un intervalle dont le c척t챕 droit ne peut 챗tre r챕solu en une r챕f챕rence n'est pas accept챕 :" #. type: delimited block - #: en/git-bundle.txt:184 @@ -11076,25 +11076,25 @@ msgid "" "fatal: Refusing to create empty bundle.\n" "$ git bundle create master-yesterday.bundle master~10..master~5\n" "fatal: Refusing to create empty bundle.\n" -msgstr "" +msgstr "$ git bundle create HEAD.bundle $(git rev-parse HEAD)\nfatal: Refus de cr챕er un colis vide.\n$ git bundle create master-yesterday.bundle master~10..master~5\nfatal: Refus de cr챕er un colis vide.\n" #. type: Title - #: en/git-bundle.txt:187 #, no-wrap, priority:100 msgid "OBJECT PREREQUISITES" -msgstr "" +msgstr "PR횋-REQUIS D'OBJET" #. type: Plain text #: en/git-bundle.txt:193 #, priority:100 msgid "When creating bundles it is possible to create a self-contained bundle that can be unbundled in a repository with no common history, as well as providing negative revisions to exclude objects needed in the earlier parts of the history." -msgstr "" +msgstr "Lors de la cr챕ation de colis, il est possible de cr챕er un colis autonome qui peut 챗tre d챕group챕 dans un d챕p척t sans historique commun, ainsi que de fournir des r챕visions n챕gatives pour exclure les objets n챕cessaires dans les parties ant챕rieures de l'historique." #. type: Plain text #: en/git-bundle.txt:198 #, priority:100 msgid "Feeding a revision such as `new` to `git bundle create` will create a bundle file that contains all the objects reachable from the revision `new`. That bundle can be unbundled in any repository to obtain a full history that leads to the revision `new`:" -msgstr "" +msgstr "Fournir une r챕vision telle que `nouveau` 횪 `git bundle create` cr챕era un fichier colis qui contient tous les objets accessibles depuis la r챕vision `nouveau`. Ce colis peut 챗tre d챕group챕 dans n'importe quel d챕p척t pour obtenir un historique complet qui m챔ne 횪 la r챕vision `nouveau` :" #. type: delimited block - #: en/git-bundle.txt:201 @@ -11106,7 +11106,7 @@ msgstr "$ git bundle create complet.bundle nouveau\n" #: en/git-bundle.txt:206 #, priority:100 msgid "A revision range such as `old..new` will produce a bundle file that will require the revision `old` (and any objects reachable from it) to exist for the bundle to be \"unbundle\"-able:" -msgstr "" +msgstr "Une plage de r챕vision telle que `ancien..nouveau` produira un fichier colis qui n챕cessitera l'existence de la r챕vision `ancien` (et de tout objet pouvant 챗tre atteint 횪 partir de celle-ci) pour que le colis puisse 챗tre \"d챕group챕\" :" #. type: delimited block - #: en/git-bundle.txt:209 @@ -11118,7 +11118,7 @@ msgstr "$ git bundle create complet.bundle ancien..nouveau\n" #: en/git-bundle.txt:214 #, priority:100 msgid "A self-contained bundle without any prerequisites can be extracted into anywhere, even into an empty repository, or be cloned from (i.e., `new`, but not `old..new`)." -msgstr "" +msgstr "Un colis autonome sans pr챕-requis peut 챗tre extrait n'importe o첫, m챗me dans un d챕p척t vide, ou peut 챗tre clon챕 (c-횪-d, `nouveau`, mais pas `ancien..nouveau`)." #. type: Plain text #: en/git-bundle.txt:218 @@ -11136,7 +11136,7 @@ msgstr "Si vous voulez imiter `git clone --mirror`, qui inclurait vos refs comme #: en/git-bundle.txt:228 #, priority:100 msgid "The 'git bundle verify' command can be used to check whether your recipient repository has the required prerequisite commits for a bundle." -msgstr "" +msgstr "La commande 'git bundle verify' peut 챗tre utilis챕e pour v챕rifier si votre d챕p척t destinataire poss챔de les commits pr챕-requis n챕cessaires pour un colis." #. type: Plain text #: en/git-bundle.txt:237 @@ -16614,7 +16614,7 @@ msgstr "En cas de succ챔s, la commande renvoie le code de sortie 0." #: en/git-config.txt:76 #, priority:100 msgid "A list of all available configuration variables can be obtained using the `git help --config` command." -msgstr "" +msgstr "Une liste de toutes les variables de configuration disponibles peut 챗tre obtenue en utilisant la commande `git help --config`." #. type: Labeled list #: en/git-config.txt:81 @@ -16896,7 +16896,7 @@ msgstr "'bool-ou-int'��: canoniser selon 'bool' ou 'int', comme d챕crit ci-dess #: en/git-config.txt:204 #, priority:100 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)" -msgstr "" +msgstr "'path' : canonise en ajoutant un `~` 횪 la valeur de `$HOME` et `~user` au r챕pertoire personnel de l'utilisateur sp챕cifi챕. Ce sp챕cificateur n'a aucun effet lors de la d챕finition de la valeur (mais vous pouvez utiliser `git config section.variable ~/` depuis la ligne de commande pour laisser votre shell faire l'expansion)." #. type: Plain text #: en/git-config.txt:206 @@ -17004,31 +17004,31 @@ msgstr "--get-colorbool <nom> [<stdout-est-tty>]" #: en/git-config.txt:259 #, priority:100 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback." -msgstr "" +msgstr "Trouver le param챔tre de couleur pour `name` (par exemple, `color.diff`) et affiche \"true\" ou \"false\". `stdout-est-tty` devrait 챗tre soit \"true\" soit \"false\", et est pris en compte lorsque la configuration est \"auto\". Si `stdout-est-tty` est absent, alors v챕rifier la sortie standard de la commande elle-m챗me, et sortir avec le statut 0 si la couleur doit 챗tre utilis챕e, ou sortir avec le statut 1 sinon. Lorsque le param챔tre de couleur pour `name` est ind챕fini, la commande utilise `color.ui` comme solution de repli." #. type: Labeled list #: en/git-config.txt:260 #, no-wrap, priority:100 msgid "--get-color name [default]" -msgstr "" +msgstr "--get-color <nom> [<d챕faut>]" #. type: Plain text #: en/git-config.txt:266 #, priority:100 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`." -msgstr "" +msgstr "Trouver la couleur configur챕e pour `nom` (par exemple `color.diff.new`) et l'afficher comme s챕quence d'챕chappement de couleur ANSI sur la sortie standard. Le param챔tre optionnel `d챕faut` est utilis챕 횪 la place, s'il n'y a pas de couleur configur챕e pour `nom`." #. type: Plain text #: en/git-config.txt:270 #, priority:100 msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)." -msgstr "" +msgstr "`--type=color [--default=<d챕faut>]` est pr챕f챕r챕 횪 `--get-color` (mais notez que `--get-color` omettra le caract챔re de nouvelle ligne final affich챕 par `--type=color`)." #. type: Plain text #: en/git-config.txt:275 #, priority:100 msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)." -msgstr "" +msgstr "Ouvrir un 챕diteur pour modifier le fichier de configuration sp챕cifi챕 ; soit `--system`, `--global`, ou du d챕p척t (par d챕faut)." #. type: Labeled list #: en/git-config.txt:276 @@ -17040,7 +17040,7 @@ msgstr "--[no-]includes" #: en/git-config.txt:281 #, priority:100 msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files." -msgstr "" +msgstr "Respecter les directives `include.*` dans les fichiers de configuration lors de la recherche de valeurs. La valeur par d챕faut est `off` lorsqu'un fichier sp챕cifique est donn챕 (par exemple, en utilisant `--file`, `--global`, etc) et `on` lorsqu'on cherche dans tous les fichiers de configuration." #. type: Labeled list #: en/git-config.txt:282 @@ -17052,19 +17052,19 @@ msgstr "--default <valeur>" #: en/git-config.txt:285 #, priority:100 msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable." -msgstr "" +msgstr "Lors de l'utilisation de `--get`, et que la variable demand챕e n'est pas trouv챕e, se comporter comme si <valeur> 챕tait la valeur assign챕e 횪 cette variable." #. type: Plain text #: en/git-config.txt:291 #, priority:100 msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager." -msgstr "" +msgstr "`pager.config` n'est respect챕 que lors de l'챕num챕ration de la configuration, c'est-횪-dire lors de l'utilisation de `--list` ou de l'un des `--get-*` qui peuvent retourner plusieurs r챕sultats. Le d챕faut est d'utiliser un pager." #. type: Plain text #: en/git-config.txt:298 #, priority:100 msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:" -msgstr "" +msgstr "Si ce n'est pas d챕fini explicitement avec `--file`, il y a quatre fichiers o첫 'git config' cherchera des options de configuration :" #. type: Labeled list #: en/git-config.txt:299 @@ -17220,7 +17220,7 @@ msgstr "Si GIT_CONFIG_COUNT est d챕fini comme un nombre positif, toutes les pair #: en/git-config.txt:372 #, priority:100 msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts." -msgstr "" +msgstr "C'est utile dans les cas o첫 vous voulez lancer plusieurs commandes git avec une configuration commune mais ne pouvez pas d챕pendre d'un fichier de configuration, par exemple lorsque vous 챕crivez des scripts." #. type: Labeled list #: en/git-config.txt:373 @@ -17232,13 +17232,13 @@ msgstr "GIT_CONFIG" #: en/git-config.txt:379 #, priority:100 msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option." -msgstr "" +msgstr "Si aucune option `--file` n'est fournie 횪 `git config`, utiliser le fichier donn챕 par `GIT_CONFIG` comme s'il 챕tait fourni via `--file`. Cette variable n'a aucun effet sur les autres commandes Git, et est surtout destin챕e 횪 assurer une compatibilit챕 historique ; il n'y a g챕n챕ralement aucune raison de l'utiliser 횪 la place de l'option `--file`." #. type: Plain text #: en/git-config.txt:385 #, priority:100 msgid "Given a .git/config like this:" -msgstr "" +msgstr "Avec un .git/config comme ceci :" #. type: delimited block - #: en/git-config.txt:392 @@ -17249,7 +17249,7 @@ msgid "" "# a '#' or ';' character indicates\n" "# a comment\n" "#\n" -msgstr "" +msgstr "#\n# C'est le fichier de configuration, et\n# un caract챔re '#' ou ';' indique\n# un commentaire\n#\n" #. type: delimited block - #: en/git-config.txt:397 en/git.txt:357 @@ -17273,7 +17273,7 @@ msgid "" "[diff]\n" "\texternal = /usr/local/bin/diff-wrapper\n" "\trenames = true\n" -msgstr "" +msgstr "; Notre algorithme de diff\n[diff]\n\texternal = /usr/local/bin/diff-wrapper\n\trenames = true\n" #. type: delimited block - #: en/git-config.txt:407 @@ -17283,7 +17283,7 @@ msgid "" "[core]\n" "\tgitproxy=proxy-command for kernel.org\n" "\tgitproxy=default-proxy ; for all the rest\n" -msgstr "" +msgstr "; param챔tres du proxy\n[core]\n\tgitproxy=proxy-command pour kernel.org\n\tgitproxy=default-proxy ; pour tout le reste\n" #. type: delimited block - #: en/git-config.txt:414 @@ -17295,157 +17295,157 @@ msgid "" "[http \"https://weak.example.com\"]\n" "\tsslVerify = false\n" "\tcookieFile = /tmp/cookie.txt\n" -msgstr "" +msgstr "; HTTP\n[http]\n\tsslVerify\n[http \"https://weak.example.com\"]\n\tsslVerify = false\n\tcookieFile = /tmp/cookie.txt\n" #. type: Plain text #: en/git-config.txt:417 #, priority:100 msgid "you can set the filemode to true with" -msgstr "" +msgstr "vous pouvez mettre le filemode 횪 true avec" #. type: delimited block - #: en/git-config.txt:420 #, no-wrap, priority:100 msgid "% git config core.filemode true\n" -msgstr "" +msgstr "% git config core.filemode true\n" #. type: Plain text #: en/git-config.txt:425 #, priority:100 msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"." -msgstr "" +msgstr "Les entr챕es hypoth챕tiques de la commande proxy ont en fait un postfix pour discerner l'URL 횪 laquelle elles s'appliquent. Voici comment changer l'entr챕e pour kernel.org en \"ssh\"." #. type: delimited block - #: en/git-config.txt:428 #, no-wrap, priority:100 msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n" -msgstr "" +msgstr "% git config core.gitproxy '<\"ssh\" pour kernel.org>' 'for kernel.org$'\n" #. type: Plain text #: en/git-config.txt:431 #, priority:100 msgid "This makes sure that only the key/value pair for kernel.org is replaced." -msgstr "" +msgstr "Cela permet de s'assurer que seule la paire cl챕/valeur de kernel.org est remplac챕e." #. type: Plain text #: en/git-config.txt:433 #, priority:100 msgid "To delete the entry for renames, do" -msgstr "" +msgstr "Pour supprimer l'entr챕e pour les renommages, faites" #. type: delimited block - #: en/git-config.txt:436 #, no-wrap, priority:100 msgid "% git config --unset diff.renames\n" -msgstr "" +msgstr "% git config --unset diff.renames\n" #. type: Plain text #: en/git-config.txt:440 #, priority:100 msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line." -msgstr "" +msgstr "Si vous voulez supprimer une entr챕e pour un multivar (comme core.gitproxy ci-dessus), vous devez fournir une regex correspondant 횪 la valeur d'exactement une ligne." #. type: Plain text #: en/git-config.txt:442 #, priority:100 msgid "To query the value for a given key, do" -msgstr "" +msgstr "Pour demander la valeur d'une clef donn챕e, faites" #. type: delimited block - #: en/git-config.txt:445 #, no-wrap, priority:100 msgid "% git config --get core.filemode\n" -msgstr "" +msgstr "% git config --get core.filemode\n" #. type: Plain text #: en/git-config.txt:448 en/git-merge-index.txt:66 #, priority:100 msgid "or" -msgstr "" +msgstr "ou" #. type: delimited block - #: en/git-config.txt:451 #, no-wrap, priority:100 msgid "% git config core.filemode\n" -msgstr "" +msgstr "% git config core.filemode\n" #. type: Plain text #: en/git-config.txt:454 #, priority:100 msgid "or, to query a multivar:" -msgstr "" +msgstr "ou, pour interroger un multivar :" #. type: delimited block - #: en/git-config.txt:457 #, no-wrap, priority:100 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n" -msgstr "" +msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n" #. type: Plain text #: en/git-config.txt:460 #, priority:100 msgid "If you want to know all the values for a multivar, do:" -msgstr "" +msgstr "Si vous voulez conna챤tre toutes les valeurs d�셵n multivar, faites :" #. type: delimited block - #: en/git-config.txt:463 #, no-wrap, priority:100 msgid "% git config --get-all core.gitproxy\n" -msgstr "" +msgstr "% git config --get-all core.gitproxy\n" #. type: Plain text #: en/git-config.txt:467 #, priority:100 msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with" -msgstr "" +msgstr "Si vous aimez vivre dangereusement, vous pouvez remplacer *tout* core.gitproxy par une nouvelle valeur avec" #. type: delimited block - #: en/git-config.txt:470 #, no-wrap, priority:100 msgid "% git config --replace-all core.gitproxy ssh\n" -msgstr "" +msgstr "% git config --replace-all core.gitproxy ssh\n" #. type: Plain text #: en/git-config.txt:474 #, ignore-ellipsis, priority:100 msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:" -msgstr "" +msgstr "Cependant, si vous voulez seulement remplacer la ligne pour le proxy par d챕faut, c'est-횪-dire celui sans postfixe \"for ...\", faites quelque chose comme ceci :" #. type: delimited block - #: en/git-config.txt:477 #, no-wrap, priority:100 msgid "% git config core.gitproxy ssh '! for '\n" -msgstr "" +msgstr "% git config core.gitproxy ssh '! for '\n" #. type: Plain text #: en/git-config.txt:480 #, priority:100 msgid "To actually match only values with an exclamation mark, you have to" -msgstr "" +msgstr "Pour ne faire correspondre que les valeurs comportant un point d'exclamation, vous devez" #. type: delimited block - #: en/git-config.txt:483 #, no-wrap, priority:100 msgid "% git config section.key value '[!]'\n" -msgstr "" +msgstr "% git config section.key value '[!]'\n" #. type: Plain text #: en/git-config.txt:486 #, priority:100 msgid "To add a new proxy, without altering any of the existing ones, use" -msgstr "" +msgstr "Pour ajouter un nouveau proxy, sans modifier aucun des proxy existants, utilisez" #. type: delimited block - #: en/git-config.txt:489 #, no-wrap, priority:100 msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n" -msgstr "" +msgstr "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n" #. type: Plain text #: en/git-config.txt:493 #, priority:100 msgid "An example to use customized color from the configuration in your script:" -msgstr "" +msgstr "Un exemple d'utilisation de la couleur personnalis챕e de la configuration dans votre script :" #. type: delimited block - #: en/git-config.txt:499 @@ -17455,13 +17455,13 @@ msgid "" "WS=$(git config --get-color color.diff.whitespace \"blue reverse\")\n" "RESET=$(git config --get-color \"\" \"reset\")\n" "echo \"${WS}your whitespace color or blue reverse${RESET}\"\n" -msgstr "" +msgstr "#!/bin/sh\nWS=$(git config --get-color color.diff.whitespace \"blue reverse\")\nRESET=$(git config --get-color \"\" \"reset\")\necho \"${WS}your whitespace color or blue reverse${RESET}\"\n" #. type: Plain text #: en/git-config.txt:503 #, priority:100 msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:" -msgstr "" +msgstr "Pour les URLs dans `https://weak.example.com`, `http.sslVerify` est mis 횪 false, alors qu'il est mis 횪 `true` pour toutes les autres :" #. type: delimited block - #: en/git-config.txt:512 @@ -17474,7 +17474,7 @@ msgid "" "% git config --get-urlmatch http https://weak.example.com\n" "http.cookieFile /tmp/cookie.txt\n" "http.sslverify false\n" -msgstr "" +msgstr "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\ntrue\n% git config --type=bool --get-urlmatch http.sslverify https://weak.example.com\nfalse\n% git config --get-urlmatch http https://weak.example.com\nhttp.cookieFile /tmp/cookie.txt\nhttp.sslverify false\n" #. type: Title - #: en/git-config.txt:517 en/git-describe.txt:202 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:240 en/git-replace.txt:139 en/git-rm.txt:190 en/git-svn.txt:1150 en/git-worktree.txt:485 @@ -17486,7 +17486,7 @@ msgstr "BOGUES" #: en/git-config.txt:522 #, priority:100 msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like" -msgstr "" +msgstr "Lors de l'utilisation de la syntaxe d챕pr챕ci챕e `[section.sous-section]`, la modification d'une valeur entra챤nera l'ajout d'une cl챕 multi-lignes au lieu d'une modification, si la sous-section est donn챕e avec au moins un caract챔re majuscule. Par exemple, lorsque la configuration ressemble 횪" #. type: delimited block - #: en/git-config.txt:526 @@ -17494,13 +17494,13 @@ msgstr "" msgid "" " [section.subsection]\n" " key = value1\n" -msgstr "" +msgstr " [section.sous-section]\n cl챕 = valeur1\n" #. type: Plain text #: en/git-config.txt:529 #, priority:100 msgid "and running `git config section.Subsection.key value2` will result in" -msgstr "" +msgstr "et l'ex챕cution de `git config section.sous-section.cl챕 valeur2` donnera comme r챕sultat" #. type: delimited block - #: en/git-config.txt:534 @@ -17509,7 +17509,7 @@ msgid "" " [section.subsection]\n" " key = value1\n" " key = value2\n" -msgstr "" +msgstr " [section.sous-section]\n cl챕 = valeur1\n cl챕 = valeur 2\n" #. type: Title = #: en/git-count-objects.txt:2 @@ -17521,7 +17521,7 @@ msgstr "git-count-objects(1)" #: en/git-count-objects.txt:7 #, priority:100 msgid "git-count-objects - Count unpacked number of objects and their disk consumption" -msgstr "" +msgstr "git-count-objects - Compte le nombre d'objets non emball챕s et leur consommation disque" #. type: Plain text #: en/git-count-objects.txt:12 @@ -17533,13 +17533,13 @@ msgstr "'git count-objects' [-v] [-H | --human-readable]\n" #: en/git-count-objects.txt:17 #, priority:100 msgid "This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack." -msgstr "" +msgstr "Cette commande compte le nombre de fichiers objets d챕compress챕s et l'espace disque qu'ils consomment, pour vous aider 횪 d챕cider quand il est temps de r챕-empaqueter." #. type: Plain text #: en/git-count-objects.txt:24 #, priority:100 msgid "Report in more detail:" -msgstr "" +msgstr "Rapporter plus en d챕tail :" #. type: Plain text #: en/git-count-objects.txt:26 @@ -17551,49 +17551,49 @@ msgstr "compte혻: le nombre d'objets perdus" #: en/git-count-objects.txt:28 #, priority:100 msgid "size: disk space consumed by loose objects, in KiB (unless -H is specified)" -msgstr "" +msgstr "size : espace disque consomm챕 par les objets libres, en Kio (sauf si -H est sp챕cifi챕)" #. type: Plain text #: en/git-count-objects.txt:30 #, priority:100 msgid "in-pack: the number of in-pack objects" -msgstr "" +msgstr "in-pack : le nombre d'objets in-pack" #. type: Plain text #: en/git-count-objects.txt:32 #, priority:100 msgid "size-pack: disk space consumed by the packs, in KiB (unless -H is specified)" -msgstr "" +msgstr "size-pack : espace disque consomm챕 par les paquets, en Kio (sauf si -H est sp챕cifi챕)" #. type: Plain text #: en/git-count-objects.txt:35 #, priority:100 msgid "prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`." -msgstr "" +msgstr "prune-packable : le nombre d'objets libres qui sont 챕galement pr챕sents dans les paquets. Ces objets peuvent 챗tre 챕lagu챕s en utilisant `git prune-packed`." #. type: Plain text #: en/git-count-objects.txt:38 #, priority:100 msgid "garbage: the number of files in object database that are neither valid loose objects nor valid packs" -msgstr "" +msgstr "garbage : le nombre de fichiers dans la base de donn챕es d'objets qui ne sont ni des objects l창ches ni des paquets valides" #. type: Plain text #: en/git-count-objects.txt:41 #, priority:100 msgid "size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified)" -msgstr "" +msgstr "size-garbage : espace disque consomm챕 par les fichiers poubelle, en Kio (sauf si -H est sp챕cifi챕)" #. type: Plain text #: en/git-count-objects.txt:46 #, priority:100 msgid "alternate: absolute path of alternate object databases; may appear multiple times, one line per path. Note that if the path contains non-printable characters, it may be surrounded by double-quotes and contain C-style backslashed escape sequences." -msgstr "" +msgstr "alternate : chemin absolu des bases de donn챕es d'objets alternatifs ; peut appara챤tre plusieurs fois, une ligne par chemin. Notez que si le chemin d'acc챔s contient des caract챔res non imprimables, il peut 챗tre entour챕 de guillemets doubles et contenir des s챕quences d'챕chappement antislash de style C." #. type: Labeled list #: en/git-count-objects.txt:47 en/git-cvsserver.txt:61 en/git-grep.txt:114 #, no-wrap, priority:100 msgid "-H" -msgstr "" +msgstr "-H" #. type: Labeled list #: en/git-count-objects.txt:48 @@ -17617,31 +17617,31 @@ msgstr "git-credential-cache--daemon(1)" #: en/git-credential-cache--daemon.txt:7 #, priority:100 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory" -msgstr "" +msgstr "git-credential-cache--daemon - Stocke temporairement les informations d'identification de l'utilisateur en m챕moire" #. type: Plain text #: en/git-credential-cache--daemon.txt:12 #, no-wrap, priority:100 msgid "git credential-cache--daemon [--debug] <socket>\n" -msgstr "" +msgstr "git credential-cache--daemon [--debug] <socket>\n" #. type: Plain text #: en/git-credential-cache--daemon.txt:18 #, priority:100 msgid "You probably don't want to invoke this command yourself; it is started automatically when you use linkgit:git-credential-cache[1]." -msgstr "" +msgstr "Vous ne voudrez probablement pas invoquer cette commande vous-m챗me ; elle est lanc챕e automatiquement lorsque vous utilisez linkgit:git-credential-cache[1]." #. type: Plain text #: en/git-credential-cache--daemon.txt:23 #, priority:100 msgid "This command listens on the Unix domain socket specified by `<socket>` for `git-credential-cache` clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits." -msgstr "" +msgstr "Cette commande 챕coute les clients `git-credential-cache` sur le socket de domaine Unix sp챕cifi챕 par `<socket>`. Les clients peuvent stocker et r챕cup챕rer des informations d'identification. Chaque justificatif est conserv챕 pendant un d챕lai sp챕cifi챕 par le client ; une fois qu'aucun justificatif n'est conserv챕, le d챕mon se termine." #. type: Plain text #: en/git-credential-cache--daemon.txt:27 #, priority:100 msgid "If the `--debug` option is specified, the daemon does not close its stderr stream, and may output extra diagnostics to it even after it has begun listening for clients." -msgstr "" +msgstr "Si l'option `--debug` est sp챕cifi챕e, le daemon ne ferme pas son flux stderr, et peut y 챕mettre des diagnostics suppl챕mentaires m챗me apr챔s avoir commenc챕 횪 챕couter les clients." #. type: Title = #: en/git-credential-cache.txt:2 @@ -17653,37 +17653,37 @@ msgstr "git-credential-cache(1)" #: en/git-credential-cache.txt:7 #, priority:100 msgid "git-credential-cache - Helper to temporarily store passwords in memory" -msgstr "" +msgstr "git-credential-cache - Aide pour stocker temporairement les mots de passe en m챕moire" #. type: delimited block - #: en/git-credential-cache.txt:12 #, no-wrap, priority:100 msgid "git config credential.helper 'cache [<options>]'\n" -msgstr "" +msgstr "git config credential.helper 'cache [<options>]'\n" #. type: Plain text #: en/git-credential-cache.txt:21 #, priority:100 msgid "This command caches credentials in memory for use by future Git programs. The stored credentials never touch the disk, and are forgotten after a configurable timeout. The cache is accessible over a Unix domain socket, restricted to the current user by filesystem permissions." -msgstr "" +msgstr "Cette commande met en cache les informations d'identification en m챕moire pour 챗tre utilis챕es par les futurs programmes Git. Les informations d'identification stock챕es ne touchent jamais le disque, et sont oubli챕es apr챔s un d챕lai configurable. Le cache est accessible via un socket de domaine Unix, limit챕 횪 l'utilisateur actuel par les permissions du syst챔me de fichiers." #. type: Plain text #: en/git-credential-cache.txt:25 #, priority:100 msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of Git. See linkgit:gitcredentials[7] or `EXAMPLES` below." -msgstr "" +msgstr "Vous n'avez probablement pas envie d'invoquer cette commande directement ; elle est destin챕e 횪 챗tre utilis챕e comme une aide 횪 l'identification par d'autres parties de Git. Voir linkgit:gitcredentials[7] ou `EXEMPLES` ci-dessous." #. type: Labeled list #: en/git-credential-cache.txt:29 #, no-wrap, priority:100 msgid "--timeout <seconds>" -msgstr "" +msgstr "--timeout <secondes>" #. type: Plain text #: en/git-credential-cache.txt:32 #, priority:100 msgid "Number of seconds to cache credentials (default: 900)." -msgstr "" +msgstr "Nombre de secondes pour mettre en cache les informations d'identification (par d챕faut : 900)." #. type: Labeled list #: en/git-credential-cache.txt:33 @@ -17695,19 +17695,19 @@ msgstr "--socket <chemin>" #: en/git-credential-cache.txt:43 #, priority:100 msgid "Use `<path>` to contact a running cache daemon (or start a new cache daemon if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket` unless `~/.git-credential-cache/` exists in which case `~/.git-credential-cache/socket` is used instead. If your home directory is on a network-mounted filesystem, you may need to change this to a local filesystem. You must specify an absolute path." -msgstr "" +msgstr "Utiliser `<chemin>` pour contacter un d챕mon de cache en cours d'ex챕cution (ou d챕marrer un nouveau d챕mon de cache s'il n'en existe pas). La valeur par d챕faut est `$XDG_CACHE_HOME/git/credential/socket` sauf si `~/.git-credential-cache/` existe, auquel cas `~/.git-credential-cache/socket` est utilis챕 횪 la place. Si votre r챕pertoire personnel est sur un syst챔me de fichiers mont챕 sur le r챕seau, vous devrez peut-챗tre le changer pour un syst챔me de fichiers local. Vous devez sp챕cifier un chemin absolu." #. type: Title - #: en/git-credential-cache.txt:45 #, no-wrap, priority:100 msgid "CONTROLLING THE DAEMON" -msgstr "" +msgstr "CONTR횚LER LE DAEMON" #. type: Plain text #: en/git-credential-cache.txt:49 #, priority:100 msgid "If you would like the daemon to exit early, forgetting all cached credentials before their timeout, you can issue an `exit` action:" -msgstr "" +msgstr "Si vous souhaitez que le daemon se termine pr챕matur챕ment, en oubliant toutes les informations d'identification mises en cache avant leur expiration, vous pouvez lancer une action `exit` :" #. type: delimited block - #: en/git-credential-cache.txt:52 @@ -17719,7 +17719,7 @@ msgstr "git credential-cache exit\n" #: en/git-credential-cache.txt:59 en/git-credential-store.txt:75 #, priority:100 msgid "The point of this helper is to reduce the number of times you must type your username or password. For example:" -msgstr "" +msgstr "Le but de cette aide est de r챕duire le nombre de fois o첫 vous devez taper votre nom d'utilisateur ou votre mot de passe. Par exemple :" #. type: delimited block - #: en/git-credential-cache.txt:65 @@ -17729,7 +17729,7 @@ msgid "" "$ git push http://example.com/repo.git\n" "Username: <type your username>\n" "Password: <type your password>\n" -msgstr "" +msgstr "$ git config credential.helper cache\n$ git push http://example.com/repo.git\nNom d'utilisateur : <Tapez votre nom d'utilisateur>\nMot de passe : <Tapez votre mot de passe>\n" #. type: delimited block - #: en/git-credential-cache.txt:69 @@ -17738,19 +17738,19 @@ msgid "" "[work for 5 more minutes]\n" "$ git push http://example.com/repo.git\n" "[your credentials are used automatically]\n" -msgstr "" +msgstr "[travail pendant 5 minutes de plus]\n$ git push http://example.com/repo.git\n[vos informations d'identification sont utilis챕es automatiquement]\n" #. type: Plain text #: en/git-credential-cache.txt:73 #, priority:100 msgid "You can provide options via the credential.helper configuration variable (this example drops the cache time to 5 minutes):" -msgstr "" +msgstr "Vous pouvez fournir des options via la variable de configuration credential.helper (dans cet exemple, le temps de cache est r챕duit 횪 5 minutes) :" #. type: delimited block - #: en/git-credential-cache.txt:76 #, no-wrap, priority:100 msgid "$ git config credential.helper 'cache --timeout=300'\n" -msgstr "" +msgstr "$ git config credential.helper 'cache --timeout=300'\n" #. type: Title = #: en/git-credential-store.txt:2 @@ -17762,31 +17762,31 @@ msgstr "git-credential-store(1)" #: en/git-credential-store.txt:7 #, priority:100 msgid "git-credential-store - Helper to store credentials on disk" -msgstr "" +msgstr "git-credential-store - Aide pour stocker les informations d'identification sur disque" #. type: delimited block - #: en/git-credential-store.txt:12 #, no-wrap, priority:100 msgid "git config credential.helper 'store [<options>]'\n" -msgstr "" +msgstr "git config credential.helper 'store [<options>]'\n" #. type: Plain text #: en/git-credential-store.txt:21 #, priority:100 msgid "Using this helper will store your passwords unencrypted on disk, protected only by filesystem permissions. If this is not an acceptable security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system." -msgstr "" +msgstr "L'utilisation de cette aide stockera vos mots de passe en clair sur le disque, prot챕g챕s uniquement par les permissions du syst챔me de fichiers. Si ce n'est pas un compromis de s챕curit챕 acceptable, essayez linkgit:git-credential-cache[1], ou trouvez une aide qui s'int챔gre au stockage s챕curis챕 fourni par votre syst챔me d'exploitation." #. type: Plain text #: en/git-credential-store.txt:24 #, priority:100 msgid "This command stores credentials indefinitely on disk for use by future Git programs." -msgstr "" +msgstr "Cette commande stocke les informations d'identification ind챕finiment sur le disque pour 챗tre utilis챕es par de futurs programmes Git." #. type: Plain text #: en/git-credential-store.txt:28 #, priority:100 msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of git. See linkgit:gitcredentials[7] or `EXAMPLES` below." -msgstr "" +msgstr "Vous ne voudrez probablement pas invoquer cette commande directement ; elle est destin챕e 횪 챗tre utilis챕e comme une aide pour les informations d'identification par d'autres parties de git. Voir linkgit:gitcredentials[7] ou `EXEMPLES` ci-dessous." #. type: Labeled list #: en/git-credential-store.txt:32 @@ -17798,13 +17798,13 @@ msgstr "--file=<chemin>" #: en/git-credential-store.txt:42 #, priority:100 msgid "Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <<FILES>>." -msgstr "" +msgstr "Utilisez `<chemin>` pour rechercher et stocker les informations d'identification. Les permissions du syst챔me de fichiers du fichier seront d챕finies pour emp챗cher les autres utilisateurs du syst챔me de le lire, mais il ne sera pas crypt챕 ou prot챕g챕 d'une autre mani챔re. Si rien n'est sp챕cifi챕, les informations d'identification seront recherch챕es dans `~/.git-credentials` et `$XDG_CONFIG_HOME/git/credentials`, et les informations d'identification seront 챕crites dans `~/.git-credentials` s'il existe, ou dans `$XDG_CONFIG_HOME/git/credentials` s'il existe et que le premier n'existe pas. Voir aussi <<FICHIERS>>." #. type: Plain text #: en/git-credential-store.txt:49 #, priority:100 msgid "If not set explicitly with `--file`, there are two files where git-credential-store will search for credentials in order of precedence:" -msgstr "" +msgstr "S'il n'est pas d챕fini explicitement avec `--file`, il y a deux fichiers dans lesquels git-credential-store cherchera les informations d'identification par ordre de pr챕s챕ance :" #. type: Labeled list #: en/git-credential-store.txt:50 @@ -17816,37 +17816,37 @@ msgstr "~/.git-credentials" #: en/git-credential-store.txt:52 #, priority:100 msgid "User-specific credentials file." -msgstr "" +msgstr "Fichier d'informations d'identification sp챕cifique 횪 l'utilisateur." #. type: Labeled list #: en/git-credential-store.txt:53 #, no-wrap, priority:100 msgid "$XDG_CONFIG_HOME/git/credentials" -msgstr "" +msgstr "$XDG_CONFIG_HOME/git/credentials" #. type: Plain text #: en/git-credential-store.txt:59 #, priority:100 msgid "Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or empty, `$HOME/.config/git/credentials` will be used. Any credentials stored in this file will not be used if `~/.git-credentials` has a matching credential as well. It is a good idea not to create this file if you sometimes use older versions of Git that do not support it." -msgstr "" +msgstr "Deuxi챔me fichier d'informations d'identification sp챕cifique 횪 l'utilisateur. Si '$XDG_CONFIG_HOME' n'est pas d챕fini ou est vide, `$HOME/.config/git/credentials` sera utilis챕. Toutes les informations d'identification stock챕es dans ce fichier ne seront pas utilis챕es si `~/.git-credentials` a 챕galement des informations d'identification correspondantes. C'est une bonne id챕e de ne pas cr챕er ce fichier si vous utilisez parfois d'anciennes versions de Git qui ne le supportent pas." #. type: Plain text #: en/git-credential-store.txt:63 #, priority:100 msgid "For credential lookups, the files are read in the order given above, with the first matching credential found taking precedence over credentials found in files further down the list." -msgstr "" +msgstr "Pour la recherche des informations d'identification, les fichiers sont lus dans l'ordre indiqu챕 ci-dessus, la premi챔re information d'identification trouv챕e 챕tant prioritaire sur les informations d'identification trouv챕es dans les fichiers plus bas dans la liste." #. type: Plain text #: en/git-credential-store.txt:67 #, priority:100 msgid "Credential storage will by default write to the first existing file in the list. If none of these files exist, `~/.git-credentials` will be created and written to." -msgstr "" +msgstr "Le stockage des informations d'identification sera par d챕faut 챕crit dans le premier fichier existant de la liste. Si aucun de ces fichiers n'existe, `~/.git-credentials` sera cr챕챕 et 챕crit." #. type: Plain text #: en/git-credential-store.txt:69 #, priority:100 msgid "When erasing credentials, matching credentials will be erased from all files." -msgstr "" +msgstr "Lors de l'effacement des informations d'identification, les informations d'identification correspondantes seront effac챕es de tous les fichiers." #. type: delimited block - #: en/git-credential-store.txt:81 @@ -17856,7 +17856,7 @@ msgid "" "$ git push http://example.com/repo.git\n" "Username: <type your username>\n" "Password: <type your password>\n" -msgstr "" +msgstr "$ git config credential.helper store\n$ git push http://example.com/repo.git\nNom d'utilisateur : <Tapez votre nom d'utilisateur>\nMot de passe : <Tapez votre mot de passe>\n" #. type: delimited block - #: en/git-credential-store.txt:85 @@ -17865,7 +17865,7 @@ msgid "" "[several days later]\n" "$ git push http://example.com/repo.git\n" "[your credentials are used automatically]\n" -msgstr "" +msgstr "[plusieurs jours plus tard]\n$ git push http://example.com/repo.git\n[vos informations d'identification sont utilis챕es automatiquement]\n" #. type: Title - #: en/git-credential-store.txt:88 @@ -17877,25 +17877,25 @@ msgstr "FORMAT DE STOCKAGE" #: en/git-credential-store.txt:92 #, priority:100 msgid "The `.git-credentials` file is stored in plaintext. Each credential is stored on its own line as a URL like:" -msgstr "" +msgstr "Le fichier `.git-credentials` est stock챕 en texte clair. Chaque identit챕 est stock챕e sur sa propre ligne comme une URL comme :" #. type: delimited block - #: en/git-credential-store.txt:95 #, no-wrap, priority:100 msgid "https://user:pass@example.com\n" -msgstr "" +msgstr "https://user:pass@example.com\n" #. type: Plain text #: en/git-credential-store.txt:100 #, priority:100 msgid "No other kinds of lines (e.g. empty lines or comment lines) are allowed in the file, even though some may be silently ignored. Do not view or edit the file with editors." -msgstr "" +msgstr "Aucun autre type de ligne (par exemple, les lignes vides ou les lignes de commentaire) n'est autoris챕 dans le fichier, m챗me si certaines peuvent 챗tre ignor챕es en silence. Ne visualisez pas et ne modifiez pas le fichier avec des 챕diteurs." #. type: Plain text #: en/git-credential-store.txt:107 #, priority:100 msgid "When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file. If the protocol, hostname, and username (if we already have one) match, then the password is returned to Git. See the discussion of configuration in linkgit:gitcredentials[7] for more information." -msgstr "" +msgstr "Lorsque Git a besoin d'une authentification pour un contexte d'URL particulier, credential-store va consid챕rer ce contexte comme un motif 횪 faire correspondre 횪 chaque entr챕e du fichier credentials. Si le protocole, le nom d'h척te et le nom d'utilisateur (si nous en avons d챕j횪 un) correspondent, alors le mot de passe est renvoy챕 횪 Git. Voir la discussion sur la configuration dans linkgit:gitcredentials[7] pour plus d'informations." #. type: Title = #: en/git-credential.txt:2 @@ -17907,73 +17907,73 @@ msgstr "git-credential(1)" #: en/git-credential.txt:7 #, priority:100 msgid "git-credential - Retrieve and store user credentials" -msgstr "" +msgstr "git-credential - R챕cup챔re et stocke les informations d'identification de l'utilisateur" #. type: delimited block - #: en/git-credential.txt:12 #, no-wrap, priority:100 msgid "git credential <fill|approve|reject>\n" -msgstr "" +msgstr "git credential [fill|approve|reject]\n" #. type: Plain text #: en/git-credential.txt:24 #, priority:100 msgid "Git has an internal interface for storing and retrieving credentials from system-specific helpers, as well as prompting the user for usernames and passwords. The git-credential command exposes this interface to scripts which may want to retrieve, store, or prompt for credentials in the same manner as Git. The design of this scriptable interface models the internal C API; see credential.h for more background on the concepts." -msgstr "" +msgstr "Git poss챔de une interface interne pour stocker et r챕cup챕rer les informations d'identification 횪 partir d'assistants sp챕cifiques au syst챔me, ainsi que pour demander 횪 l'utilisateur des noms d'utilisateur et des mots de passe. La commande git-credential expose cette interface aux scripts qui peuvent vouloir r챕cup챕rer, stocker ou demander des informations d'identification de la m챗me mani챔re que Git. La conception de cette interface scriptable mod챕lise l'API C interne ; voir credential.h pour plus de d챕tails sur les concepts." #. type: Plain text #: en/git-credential.txt:28 #, priority:100 msgid "git-credential takes an \"action\" option on the command-line (one of `fill`, `approve`, or `reject`) and reads a credential description on stdin (see <<IOFMT,INPUT/OUTPUT FORMAT>>)." -msgstr "" +msgstr "git-credential prend une option \"action\" sur la ligne de commande (une parmi `fill`, `approve`, ou `reject`) et lit une description de credential sur stdin (voir <<IOFMT, FORMAT D'ENTR횋E/SORTIE>>)." #. type: Plain text #: en/git-credential.txt:35 #, priority:100 msgid "If the action is `fill`, git-credential will attempt to add \"username\" and \"password\" attributes to the description by reading config files, by contacting any configured credential helpers, or by prompting the user. The username and password attributes of the credential description are then printed to stdout together with the attributes already provided." -msgstr "" +msgstr "Si l'action est `fill`, git-credential tentera d'ajouter les attributs \"username\" et \"password\" 횪 la description en lisant les fichiers de configuration, en contactant les assistants d'authentification configur챕s, ou en demandant 횪 l'utilisateur. Les attributs \"username\" et \"password\" de la description de l'authentification sont ensuite imprim챕s sur stdout avec les attributs d챕j횪 fournis." #. type: Plain text #: en/git-credential.txt:39 #, priority:100 msgid "If the action is `approve`, git-credential will send the description to any configured credential helpers, which may store the credential for later use." -msgstr "" +msgstr "Si l'action est `approve`, git-credential enverra la description 횪 tout assistant d'accr챕ditation configur챕, qui peut stocker l'accr챕ditation pour une utilisation ult챕rieure." #. type: Plain text #: en/git-credential.txt:43 #, priority:100 msgid "If the action is `reject`, git-credential will send the description to any configured credential helpers, which may erase any stored credential matching the description." -msgstr "" +msgstr "Si l'action est `reject`, git-credential enverra la description 횪 tous les assistants d'authentification configur챕s, qui peuvent effacer toute authentification stock챕e correspondant 횪 la description." #. type: Plain text #: en/git-credential.txt:45 #, priority:100 msgid "If the action is `approve` or `reject`, no output should be emitted." -msgstr "" +msgstr "Si l'action est `approve` ou `reject`, aucune sortie ne doit 챗tre 챕mise." #. type: Title - #: en/git-credential.txt:47 #, no-wrap, priority:100 msgid "TYPICAL USE OF GIT CREDENTIAL" -msgstr "" +msgstr "UTILISATION TYPIQUE DE L'AUTHENTIFICATION GIT" #. type: Plain text #: en/git-credential.txt:51 #, priority:100 msgid "An application using git-credential will typically use `git credential` following these steps:" -msgstr "" +msgstr "Une application utilisant git-credential utilisera typiquement `git credential` en suivant ces 챕tapes :" #. type: Plain text #: en/git-credential.txt:53 #, priority:100 msgid "Generate a credential description based on the context." -msgstr "" +msgstr "G챕n챕rer une description d'authentification bas챕e sur le contexte." #. type: Plain text #: en/git-credential.txt:59 #, priority:100 msgid "For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the information it has):" -msgstr "" +msgstr "Par exemple, si nous voulons un mot de passe pour `https://example.com/foo.git`, nous pourrions g챕n챕rer la description d'authentification suivante (n'oubliez pas la ligne blanche 횪 la fin ; elle indique 횪 `git credential` que l'application a fini de fournir toutes les informations dont elle dispose) :" #. type: Plain text #: en/git-credential.txt:63 @@ -17982,13 +17982,13 @@ msgid "" "\t protocol=https\n" "\t host=example.com\n" "\t path=foo.git\n" -msgstr "" +msgstr "\t protocol=https\n\t host=example.com\n\t path=foo.git\n" #. type: Plain text #: en/git-credential.txt:69 #, priority:100 msgid "Ask git-credential to give us a username and password for this description. This is done by running `git credential fill`, feeding the description from step (1) to its standard input. The complete credential description (including the credential per se, i.e. the login and password) will be produced on standard output, like:" -msgstr "" +msgstr "Demander 횪 git-credential de nous donner un nom d'utilisateur et un mot de passe pour cette description. Ceci est fait en ex챕cutant `git credential fill`, en fournissant la description de l'챕tape (1) 횪 son entr챕e standard. La description compl챔te des identifiants (incluant l'identification elle-m챗me, c'est-횪-dire le nom d'utilisateur et le mot de passe) sera produite sur la sortie standard, comme :" #. type: Plain text #: en/git-credential.txt:74 @@ -17998,61 +17998,61 @@ msgid "" "host=example.com\n" "username=bob\n" "password=secr3t\n" -msgstr "" +msgstr "protocol=https\nhost=example.com\nusername=bob\npassword=secr3t\n" #. type: Plain text #: en/git-credential.txt:79 #, priority:100 msgid "In most cases, this means the attributes given in the input will be repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false." -msgstr "" +msgstr "Dans la plupart des cas, cela signifie que les attributs donn챕s en entr챕e seront r챕p챕t챕s en sortie, mais Git peut aussi modifier la description des identifiants, par exemple en supprimant l'attribut `path` lorsque le protocole est HTTP(s) et que `credential.useHttpPath` est faux." #. type: Plain text #: en/git-credential.txt:85 #, priority:100 msgid "If the `git credential` knew about the password, this step may not have involved the user actually typing this password (the user may have typed a password to unlock the keychain instead, or no user interaction was done if the keychain was already unlocked) before it returned `password=secr3t`." -msgstr "" +msgstr "Si le `git credential` connaissait le mot de passe, cette 챕tape peut ne pas avoir impliqu챕 que l'utilisateur tape r챕ellement ce mot de passe (l'utilisateur peut avoir tap챕 un mot de passe pour d챕verrouiller le trousseau 횪 la place, ou aucune interaction de l'utilisateur n'a 챕t챕 faite si le trousseau 챕tait d챕j횪 d챕verrouill챕) avant de retourner `password=secr3t`." #. type: Plain text #: en/git-credential.txt:88 #, priority:100 msgid "Use the credential (e.g., access the URL with the username and password from step (2)), and see if it's accepted." -msgstr "" +msgstr "Utiliser le justificatif d'identit챕 (par exemple, acc챕der 횪 l'URL avec le nom d'utilisateur et le mot de passe de l'챕tape (2)), et voir s'il est accept챕." #. type: Plain text #: en/git-credential.txt:98 #, priority:100 msgid "Report on the success or failure of the password. If the credential allowed the operation to complete successfully, then it can be marked with an \"approve\" action to tell `git credential` to reuse it in its next invocation. If the credential was rejected during the operation, use the \"reject\" action so that `git credential` will ask for a new password in its next invocation. In either case, `git credential` should be fed with the credential description obtained from step (2) (which also contain the ones provided in step (1))." -msgstr "" +msgstr "Rapporter sur le succ챔s ou l'챕chec du mot de passe. Si l'identifiant a permis 횪 l'op챕ration de se terminer avec succ챔s, il peut 챗tre marqu챕 avec une action \"approve\" pour dire 횪 `git credential` de le r챕utiliser dans sa prochaine invocation. Si l'identifiant a 챕t챕 rejet챕 pendant l'op챕ration, utiliser l'action \"reject\" pour que `git credential` demande un nouveau mot de passe lors de sa prochaine invocation. Dans les deux cas, `git credential` doit 챗tre aliment챕 avec la description de l'identifiant obtenue 횪 l'챕tape (2) (qui contient 챕galement celle fournie 횪 l'챕tape (1))." #. type: Title - #: en/git-credential.txt:101 #, no-wrap, priority:100 msgid "INPUT/OUTPUT FORMAT" -msgstr "" +msgstr "FORMAT D'ENTR횋E/SORTIE" #. type: Plain text #: en/git-credential.txt:108 #, priority:100 msgid "`git credential` reads and/or writes (depending on the action used) credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login information (e.g. host, protocol, path), or to the actual credential data to be obtained (username/password)." -msgstr "" +msgstr "`git credential` lit et/ou 챕crit (en fonction de l'action utilis챕e) des informations d'identification dans son entr챕e/sortie standard. Ces informations peuvent correspondre soit 횪 des cl챕s pour lesquelles `git credential` obtiendra les informations de connexion (par exemple, h척te, protocole, chemin), soit aux donn챕es d'identification r챕elles 횪 obtenir (nom d'utilisateur/mot de passe)." #. type: Plain text #: en/git-credential.txt:112 #, priority:100 msgid "The credential is split into a set of named attributes, with one attribute per line. Each attribute is specified by a key-value pair, separated by an `=` (equals) sign, followed by a newline." -msgstr "" +msgstr "L'identifiant est divis챕 en un ensemble d'attributs nomm챕s, avec un attribut par ligne. Chaque attribut est sp챕cifi챕 par une paire cl챕-valeur, s챕par챕e par un signe `=` (챕gal), suivi d'une nouvelle ligne." #. type: Plain text #: en/git-credential.txt:115 #, priority:100 msgid "The key may contain any bytes except `=`, newline, or NUL. The value may contain any bytes except newline or NUL." -msgstr "" +msgstr "La cl챕 peut contenir n'importe quel octet sauf `=`, newline ou NUL. La valeur peut contenir n'importe quel octet, 횪 l'exception de newline ou NUL." #. type: Plain text #: en/git-credential.txt:119 #, priority:100 msgid "In both cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file." -msgstr "" +msgstr "Dans les deux cas, tous les octets sont trait챕s tels quels (c'est-횪-dire qu'il n'y a pas de guillemets et qu'on ne peut pas transmettre une valeur contenant une nouvelle ligne ou NUL). La liste des attributs se termine par une ligne blanche ou une fin de fichier." #. type: Plain text #: en/git-credential.txt:121 @@ -18070,7 +18070,7 @@ msgstr "`protocol`" #: en/git-credential.txt:126 #, priority:100 msgid "The protocol over which the credential will be used (e.g., `https`)." -msgstr "" +msgstr "Le protocole sur lequel l'identifiant sera utilis챕 (par exemple, `https`)." #. type: Labeled list #: en/git-credential.txt:127 @@ -18082,7 +18082,7 @@ msgstr "`host`" #: en/git-credential.txt:131 #, priority:100 msgid "The remote hostname for a network credential. This includes the port number if one was specified (e.g., \"example.com:8088\")." -msgstr "" +msgstr "Le nom d'h척te distant pour un identifiant r챕seau. Cela inclut le num챕ro de port s'il a 챕t챕 sp챕cifi챕 (par exemple, \"exemple.com:8088\")." #. type: Labeled list #: en/git-credential.txt:132 @@ -18094,7 +18094,7 @@ msgstr "`path`" #: en/git-credential.txt:137 #, priority:100 msgid "The path with which the credential will be used. E.g., for accessing a remote https repository, this will be the repository's path on the server." -msgstr "" +msgstr "Le chemin avec lequel l'identifiant sera utilis챕. Par exemple, pour acc챕der 횪 un r챕f챕rentiel https distant, ce sera le chemin du r챕f챕rentiel sur le serveur." #. type: Labeled list #: en/git-credential.txt:138 @@ -18106,7 +18106,7 @@ msgstr "`username`" #: en/git-credential.txt:142 #, priority:100 msgid "The credential's username, if we already have one (e.g., from a URL, the configuration, the user, or from a previously run helper)." -msgstr "" +msgstr "Le nom d'utilisateur de l'identifiant, si nous en avons d챕j횪 un (par exemple, 횪 partir d'une URL, de la configuration, de l'utilisateur ou d'une aide pr챕c챕demment ex챕cut챕e)." #. type: Labeled list #: en/git-credential.txt:143 @@ -18118,7 +18118,7 @@ msgstr "`password`" #: en/git-credential.txt:146 #, priority:100 msgid "The credential's password, if we are asking it to be stored." -msgstr "" +msgstr "Le mot de passe de l'identifiant, si nous demandons qu'il soit stock챕." #. type: Labeled list #: en/git-credential.txt:147 @@ -18130,19 +18130,19 @@ msgstr "`url`" #: en/git-credential.txt:154 #, priority:100 msgid "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves." -msgstr "" +msgstr "Lorsque cet attribut sp챕cial est lu par `git credential`, la valeur est analys챕e comme une URL et trait챕e comme si ses parties constitutives 챕taient lues (par exemple, `url=https://example.com` se comporterait comme si `protocol=https` et `host=example.com` avaient 챕t챕 fournis). Cela peut aider les appelants 횪 챕viter d'analyser eux-m챗mes les URL." #. type: Plain text #: en/git-credential.txt:159 #, priority:100 msgid "Note that specifying a protocol is mandatory and if the URL doesn't specify a hostname (e.g., \"cert:///path/to/file\") the credential will contain a hostname attribute whose value is an empty string." -msgstr "" +msgstr "Notez que la sp챕cification d'un protocole est obligatoire et que si l'URL ne sp챕cifie pas de nom d'h척te (par exemple, \"cert:///chemin/vers/un/fichier\"), l'identifiant contiendra un attribut de nom d'h척te dont la valeur est une cha챤ne vide." #. type: Plain text #: en/git-credential.txt:162 #, priority:100 msgid "Components which are missing from the URL (e.g., there is no username in the example above) will be left unset." -msgstr "" +msgstr "Les composants qui manquent dans l'URL (par exemple, il n'y a pas de nom d'utilisateur dans l'exemple ci-dessus) ne seront pas d챕finis." #. type: Title = #: en/git-cvsexportcommit.txt:2 @@ -18154,7 +18154,7 @@ msgstr "git-cvsexportcommit(1)" #: en/git-cvsexportcommit.txt:7 #, priority:100 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout" -msgstr "" +msgstr "git-cvsexportcommit - Exporter un seul commit vers une extraction CVS" #. type: Plain text #: en/git-cvsexportcommit.txt:14 @@ -18162,103 +18162,103 @@ msgstr "" msgid "" "'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]\n" "\t[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID\n" -msgstr "" +msgstr "git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]\n\t[-w cvsworkdir] [-W] [-f] [-m <pr챕fixe-msg>] [<commit-parent>] <id-commit>\n" #. type: Plain text #: en/git-cvsexportcommit.txt:20 #, priority:100 msgid "Exports a commit from Git to a CVS checkout, making it easier to merge patches from a Git repository into a CVS repository." -msgstr "" +msgstr "Exporte un commit de Git vers une extraction CVS, ce qui facilite la fusion des rustines d'un d챕p척t Git vers un d챕p척t CVS." #. type: Plain text #: en/git-cvsexportcommit.txt:24 #, priority:100 msgid "Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must be defined. See examples below." -msgstr "" +msgstr "Sp챕cifier le nom d'une extraction CVS en utilisant le commutateur -w ou l'ex챕cuter depuis la racine de la copie de travail CVS. Dans ce dernier cas, GIT_DIR doit 챗tre d챕fini. Voir les exemples ci-dessous." #. type: Plain text #: en/git-cvsexportcommit.txt:28 #, priority:100 msgid "It does its best to do the safe thing, it will check that the files are unchanged and up to date in the CVS checkout, and it will not autocommit by default." -msgstr "" +msgstr "Il fait de son mieux pour faire ce qui est le plus s청r, il v챕rifiera que les fichiers sont inchang챕s et 횪 jour dans le checkout CVS, et il ne fera pas d'autocommit par d챕faut." #. type: Plain text #: en/git-cvsexportcommit.txt:30 #, priority:100 msgid "Supports file additions, removals, and commits that affect binary files." -msgstr "" +msgstr "Prend en charge les ajouts, les suppressions et les modifications de fichiers qui affectent les fichiers binaires." #. type: Plain text #: en/git-cvsexportcommit.txt:33 #, priority:100 msgid "If the commit is a merge commit, you must tell 'git cvsexportcommit' what parent the changeset should be done against." -msgstr "" +msgstr "Si le commit est un commit de fusion, vous devez dire 횪 'git cvsexportcommit' contre quel parent le changeset doit 챗tre fait." #. type: Plain text #: en/git-cvsexportcommit.txt:40 #, priority:100 msgid "Commit automatically if the patch applied cleanly. It will not commit if any hunks fail to apply or there were other problems." -msgstr "" +msgstr "La validation est automatique si la rustine s'est appliqu챕e proprement. Il ne sera pas valid챕 si des sections n'ont pas 챕t챕 appliqu챕es ou s'il y a eu d'autres probl챔mes." #. type: Plain text #: en/git-cvsexportcommit.txt:44 #, priority:100 msgid "Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0" -msgstr "" +msgstr "Mode p챕dant (parano챦aque) lors de l�셙pplication de rustines. Appelle `patch` avec --fuzz=0" #. type: Plain text #: en/git-cvsexportcommit.txt:48 #, priority:100 msgid "Add authorship information. Adds Author line, and Committer (if different from Author) to the message." -msgstr "" +msgstr "Ajouter des informations sur l'auteur. Ajoute la ligne Auteur, et Validateur (si diff챕rent de l'auteur) au message." #. type: Plain text #: en/git-cvsexportcommit.txt:53 #, priority:100 msgid "Set an alternative CVSROOT to use. This corresponds to the CVS -d parameter. Usually users will not want to set this, except if using CVS in an asymmetric fashion." -msgstr "" +msgstr "D챕finir un CVSROOT alternatif 횪 utiliser. Ceci correspond au param챔tre CVS -d. En g챕n챕ral, les utilisateurs ne souhaitent pas d챕finir ce param챔tre, sauf s'ils utilisent CVS de mani챔re asym챕trique." #. type: Plain text #: en/git-cvsexportcommit.txt:56 #, priority:100 msgid "Force the merge even if the files are not up to date." -msgstr "" +msgstr "Force la fusion m챗me si les fichiers ne sont pas 횪 jour." #. type: Plain text #: en/git-cvsexportcommit.txt:59 #, priority:100 msgid "Force the parent commit, even if it is not a direct parent." -msgstr "" +msgstr "Forcer le commit parent , m챗me s�셢l ne s�셙git pas d�셵n parent direct." #. type: Plain text #: en/git-cvsexportcommit.txt:63 #, priority:100 msgid "Prepend the commit message with the provided prefix. Useful for patch series and the like." -msgstr "" +msgstr "Pr챕fixe le message de validation avec le pr챕fixe fourni. Utile pour les s챕ries de patchs et autres." #. type: Plain text #: en/git-cvsexportcommit.txt:66 #, priority:100 msgid "Update affected files from CVS repository before attempting export." -msgstr "" +msgstr "Mettre 횪 jour les fichiers affect챕s du d챕p척t CVS avant de tenter l'exportation." #. type: Plain text #: en/git-cvsexportcommit.txt:70 #, priority:100 msgid "Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes $Revision$) in working CVS checkout before applying patch." -msgstr "" +msgstr "Inverser l'expansion des mots-cl챕s CVS (par exemple, $Revision : 1.2.3.4$ devient $Revision$) dans l'extraction CVS de travail avant d'appliquer la rustine." #. type: Plain text #: en/git-cvsexportcommit.txt:76 #, priority:100 msgid "Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the current directory is within a Git repository. The default is the value of 'cvsexportcommit.cvsdir'." -msgstr "" +msgstr "Sp챕cifier l'emplacement de l'extraction CVS 횪 utiliser pour l'exportation. Cette option ne n챕cessite pas que GIT_DIR soit d챕fini avant l'ex챕cution si le r챕pertoire actuel se trouve dans un d챕p척t Git. La valeur par d챕faut est celle de 'cvsexportcommit.cvsdir'." #. type: Plain text #: en/git-cvsexportcommit.txt:81 #, priority:100 msgid "Tell cvsexportcommit that the current working directory is not only a Git checkout, but also the CVS checkout. Therefore, Git will reset the working directory to the parent commit before proceeding." -msgstr "" +msgstr "Indiquer 횪 cvsexportcommit que le r챕pertoire de travail actuel n'est pas seulement une extraction Git, mais aussi une extraction CVS. Par cons챕quent, Git r챕initialisera le r챕pertoire de travail au commit parent avant de poursuivre." #. type: Plain text #: en/git-cvsexportcommit.txt:84 @@ -18276,13 +18276,13 @@ msgstr "cvsexportcommit.cvsdir" #: en/git-cvsexportcommit.txt:89 #, priority:100 msgid "The default location of the CVS checkout to use for the export." -msgstr "" +msgstr "L'emplacement par d챕faut de l'extraction CVS 횪 utiliser pour l'exportation." #. type: Labeled list #: en/git-cvsexportcommit.txt:93 #, no-wrap, priority:100 msgid "Merge one patch into CVS" -msgstr "" +msgstr "Fusionner une rustine dans le CVS" #. type: delimited block - #: en/git-cvsexportcommit.txt:100 @@ -18292,25 +18292,25 @@ msgid "" "$ cd ~/project_cvs_checkout\n" "$ git cvsexportcommit -v <commit-sha1>\n" "$ cvs commit -F .msg <files>\n" -msgstr "" +msgstr "$ export GIT_DIR=~/project/.git\n$ cd ~/project_cvs_checkout\n$ git cvsexportcommit -v <sha1-commit>\n$ cvs commit -F .msg <fichiers>\n" #. type: Labeled list #: en/git-cvsexportcommit.txt:102 #, no-wrap, priority:100 msgid "Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo" -msgstr "" +msgstr "Fusionner une rustine dans CVS (options -c et -w). Le r챕pertoire de travail se trouve dans le d챕p척t Git" #. type: delimited block - #: en/git-cvsexportcommit.txt:106 #, no-wrap, priority:100 msgid "\t$ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>\n" -msgstr "" +msgstr "\t$ git cvsexportcommit -v -c -w ~/projet_cvs_extrait <sha1-commit>\n" #. type: Labeled list #: en/git-cvsexportcommit.txt:108 #, no-wrap, priority:100 msgid "Merge pending patches into CVS automatically -- only if you really know what you are doing" -msgstr "" +msgstr "Fusionner automatiquement les rustines en attente dans CVS - seulement si vous savez vraiment ce que vous faites" #. type: delimited block - #: en/git-cvsexportcommit.txt:114 @@ -18319,7 +18319,7 @@ msgid "" "$ export GIT_DIR=~/project/.git\n" "$ cd ~/project_cvs_checkout\n" "$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v\n" -msgstr "" +msgstr "$ export GIT_DIR=~/projet/.git\n$ cd ~/projet_cvs_extrait\n$ git cherry cvshead mahead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v\n" #. type: Title = #: en/git-cvsimport.txt:2 @@ -18342,7 +18342,7 @@ msgid "" "\t [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n" "\t [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]\n" "\t [-r <remote>] [-R] [<CVS_module>]\n" -msgstr "" +msgstr "'git cvsimport' [-o <branche-pour-HEAD>] [-h] [-v] [-d <CVSROOT>]\n\t [-A <fichier-conv-auteur>] [-p <options-pour-cvsps>] [-P <fichier>]\n\t [-C <depot-git>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n\t [-a] [-m] [-M <regex>] [-S <regex>] [-L <limite-commit>]\n\t [-r <distant>] [-R] [<module-CVS>]\n" #. type: Plain text #: en/git-cvsimport.txt:26 @@ -18353,19 +18353,19 @@ msgid "" "performing a one-shot import of a CVS repository consider using\n" "http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or\n" "http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export].\n" -msgstr "" +msgstr "*ATTENTION* : 'git cvsimport' utilise cvsps version 2, qui est consid챕r챕 comme\nobsol챔te; il ne fonctionne pas avec cvsps version 3 et ult챕rieure. Si vous \neffectuez une importation en une fois d�셵n d챕p척t CVS envisagez d�셵tiliser\nhttp://cvs2svn.tigris.org/cvs2git.html[cvs2git] ou\nhttp://www.catb.org/esr/cvs-fast-export/[cvs-fast-export].\n" #. type: Plain text #: en/git-cvsimport.txt:29 #, priority:100 msgid "Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one." -msgstr "" +msgstr "Importe un d챕p척t CVS dans Git. Il cr챕era un nouveau d챕p척t, ou importera de mani챔re incr챕mentielle dans un d챕p척t existant." #. type: Plain text #: en/git-cvsimport.txt:32 #, priority:100 msgid "Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required." -msgstr "" +msgstr "La division du journal CVS en ensembles de rustines est effectu챕e par'cvsps'. La version 2.1 au moins est requise." #. type: Plain text #: en/git-cvsimport.txt:35 @@ -18373,37 +18373,37 @@ msgstr "" msgid "" "*WARNING:* for certain situations the import leads to incorrect results.\n" "Please see the section <<issues,ISSUES>> for further reference.\n" -msgstr "" +msgstr "*ATTENTION*혻: pour certaines situations, l�셢mportation entra챤ne des r챕sultats incorrects.\nVeuillez consulter la section <<probl챔mes,PROBL횊MES>> pour plus de r챕f챕rence.\n" #. type: Plain text #: en/git-cvsimport.txt:42 #, priority:100 msgid "You should *never* do any work of your own on the branches that are created by 'git cvsimport'. By default initial import will create and populate a \"master\" branch from the CVS repository's main branch which you're free to work with; after that, you need to 'git merge' incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches." -msgstr "" +msgstr "Vous ne devez *jamais* effectuer de travail personnel sur les branches cr챕챕es par 'git cvsimport'. Par d챕faut, l'importation initiale cr챕era et alimentera une branche `master` 횪 partir de la branche principale du d챕p척t CVS avec laquelle vous 챗tes libre de travailler ; apr챔s cela, vous devez `git merge` les importations incr챕mentales, ou toute branche CVS, vous-m챗me. Il est conseill챕 de sp챕cifier un distant nomm챕 via -r pour s챕parer et prot챕ger les branches entrantes." #. type: Plain text #: en/git-cvsimport.txt:48 #, priority:100 msgid "If you intend to set up a shared public repository that all developers can read/write, or if you want to use linkgit:git-cvsserver[1], then you probably want to make a bare clone of the imported repository, and use the clone as the shared repository. See linkgit:gitcvs-migration[7]." -msgstr "" +msgstr "Si vous avez l'intention de mettre en place un d챕p척t public partag챕 que tous les d챕veloppeurs peuvent lire/챕crire, ou si vous voulez utiliser linkgit:git-cvsserver[1], alors vous voudrez probablement faire un clone nu du d챕p척t import챕, et utiliser le clone comme d챕p척t partag챕. Voir linkgit:gitcvs-migration[7]." #. type: Plain text #: en/git-cvsimport.txt:54 #, priority:100 msgid "Verbosity: let 'cvsimport' report what it is doing." -msgstr "" +msgstr "Verbosit챕 : laisser 'cvsimport' rapporter ce qu'il fait." #. type: Labeled list #: en/git-cvsimport.txt:55 #, no-wrap, priority:100 msgid "-d <CVSROOT>" -msgstr "" +msgstr "-d<CVSROOT>" #. type: Plain text #: en/git-cvsimport.txt:61 #, priority:100 msgid "The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods are supported. If not given, 'git cvsimport' will try to read it from `CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment variable." -msgstr "" +msgstr "La racine de l'archive CVS. Peut 챗tre local (un chemin simple) ou distant혻; actuellement, seules les m챕thodes d'acc챔s :local:, :ext: et :pserver: sont prises en charge. S'il n'est pas fourni, 'git cvsimport' essaiera de le lire 횪 partir de 'CVS/Root'. Si aucun fichier de ce type n'existe, il recherche la variable d'environnement `CVSROOT`." #. type: Labeled list #: en/git-cvsimport.txt:62 @@ -18415,13 +18415,13 @@ msgstr "<module_CVS>" #: en/git-cvsimport.txt:66 #, priority:100 msgid "The CVS module you want to import. Relative to <CVSROOT>. If not given, 'git cvsimport' tries to read it from `CVS/Repository`." -msgstr "" +msgstr "Module CVS que vous souhaitez importer. Par rapport 횪 <CVSROOT>. S�셢l n�셞st pas donn챕, 'git cvsimport' essaie de le lire 횪 partir de 'CVS/Repository'." #. type: Labeled list #: en/git-cvsimport.txt:67 #, no-wrap, priority:100 msgid "-C <target-dir>" -msgstr "" +msgstr "-C <r챕p-cible>" #. type: Plain text #: en/git-cvsimport.txt:70 @@ -18433,109 +18433,109 @@ msgstr "Le d챕p척t Git dans lequel importer. Si le r챕pertoire n'existe pas, il #: en/git-cvsimport.txt:71 #, no-wrap, priority:100 msgid "-r <remote>" -msgstr "" +msgstr "-r<distant>" #. type: Plain text #: en/git-cvsimport.txt:75 #, priority:100 msgid "The Git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by default." -msgstr "" +msgstr "Le distant Git dans lequel importer ce d챕p척t CVS. D챕place toutes les branches CVS dans remotes/<distant>/<branche> de la m챗me mani챔re que 'git clone' utilise 'origin' par d챕faut." #. type: Labeled list #: en/git-cvsimport.txt:76 #, no-wrap, priority:100 msgid "-o <branch-for-HEAD>" -msgstr "" +msgstr "-o <branche-pour-HEAD>" #. type: Plain text #: en/git-cvsimport.txt:84 #, priority:100 msgid "When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git repository, as `HEAD` already has a special meaning for Git. When a remote is specified the `HEAD` branch is named remotes/<remote>/master mirroring 'git clone' behaviour. Use this option if you want to import into a different branch." -msgstr "" +msgstr "Lorsqu�셙ucun distant n�셞st sp챕cifi챕 (via -r), la branche 'HEAD' de CVS est import챕e dans la branche 'origin' du d챕p척t Git, car 'HEAD' a d챕j횪 une signification particuli챔re pour Git. Lorsqu�셵n distant est sp챕cifi챕, la branche 'HEAD' est nomm챕e remotes/<distant>/master qui miroite le comportement de 'git clone'. Utilisez cette option si vous souhaitez importer dans une autre branche." #. type: Plain text #: en/git-cvsimport.txt:87 #, priority:100 msgid "Use '-o master' for continuing an import that was initially done by the old cvs2git tool." -msgstr "" +msgstr "Utilisez '-o master' pour poursuivre une importation qui a 챕t챕 initialement effectu챕e par l�셙ncien outil cvs2git." #. type: Plain text #: en/git-cvsimport.txt:92 #, priority:100 msgid "Import-only: don't perform a checkout after importing. This option ensures the working directory and index remain untouched and will not create them if they do not exist." -msgstr "" +msgstr "Importation uniquement : ne pas effectuer d'extraction apr챔s l�셢mportation. Cette option garantit que le r챕pertoire de travail et l�셢ndex restent intacts et ne les cr챕eront pas s�셢ls n�셞xistent pas." #. type: Plain text #: en/git-cvsimport.txt:97 #, priority:100 msgid "Kill keywords: will extract files with '-kk' from the CVS archive to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees." -msgstr "" +msgstr "Tuer les mots-cl챕s혻: extraira les fichiers avec '-kk' de l�셙rchive CVS pour 챕viter les changements bruyants. Fortement recommand챕, mais d챕sactiv챕 par d챕faut pour pr챕server la compatibilit챕 avec les premiers arbres import챕s." #. type: Plain text #: en/git-cvsimport.txt:100 #, priority:100 msgid "Convert underscores in tag and branch names to dots." -msgstr "" +msgstr "Convertir les traits de soulignement en points dans les noms d'챕tiquette et de branche." #. type: Labeled list #: en/git-cvsimport.txt:101 #, no-wrap, priority:100 msgid "-s <subst>" -msgstr "" +msgstr "-s <subst>" #. type: Plain text #: en/git-cvsimport.txt:103 #, priority:100 msgid "Substitute the character \"/\" in branch names with <subst>" -msgstr "" +msgstr "Remplacer le caract챔re \"/\" dans les noms de branche par <subst>" #. type: Labeled list #: en/git-cvsimport.txt:104 #, no-wrap, priority:100 msgid "-p <options-for-cvsps>" -msgstr "" +msgstr "-p <options-pour-cvsps>" #. type: Plain text #: en/git-cvsimport.txt:107 #, priority:100 msgid "Additional options for cvsps. The options `-u` and '-A' are implicit and should not be used here." -msgstr "" +msgstr "Options suppl챕mentaires pour cvsps. Les options `-u` et '-A' sont implicites et ne doivent pas 챗tre utilis챕es ici." #. type: Plain text #: en/git-cvsimport.txt:109 #, priority:100 msgid "If you need to pass multiple options, separate them with a comma." -msgstr "" +msgstr "Si vous devez passer plusieurs options, s챕parez-les par une virgule." #. type: Labeled list #: en/git-cvsimport.txt:110 #, no-wrap, priority:100 msgid "-z <fuzz>" -msgstr "" +msgstr "-z <fuzz>" #. type: Plain text #: en/git-cvsimport.txt:113 #, priority:100 msgid "Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s." -msgstr "" +msgstr "Transmettez le facteur de fuzz d�셡orodatage 횪 cvsps, en quelques secondes. S�셢l n�셞st pas d챕fini, cvsps est d챕fini par d챕faut sur 300s." #. type: Labeled list #: en/git-cvsimport.txt:114 #, no-wrap, priority:100 msgid "-P <cvsps-output-file>" -msgstr "" +msgstr "-P <fichier-sortie-cvsps>" #. type: Plain text #: en/git-cvsimport.txt:117 #, priority:100 msgid "Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport." -msgstr "" +msgstr "Au lieu d'appeler cvsps, lire le fichier de sortie cvsps fourni. Utile pour le d챕bogage ou lorsque cvsps est manipul챕 횪 l'ext챕rieur du cvsimport." #. type: Plain text #: en/git-cvsimport.txt:122 #, priority:100 msgid "Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the source branch name from the commit message." -msgstr "" +msgstr "Tenter de d챕tecter les fusions en se basant sur le message de validation. Cette option activera les regex par d챕faut qui tentent de capturer le nom de la branche source 횪 partir du message de validation." #. type: Labeled list #: en/git-cvsimport.txt:123 @@ -18547,19 +18547,19 @@ msgstr "-M <regex>" #: en/git-cvsimport.txt:127 #, priority:100 msgid "Attempt to detect merges based on the commit message with a custom regex. It can be used with `-m` to enable the default regexes as well. You must escape forward slashes." -msgstr "" +msgstr "Tenter de d챕tecter les fusions en se basant sur le message de validation avec une regex personnalis챕e. Elle peut 챗tre utilis챕e avec `-m` pour activer les regex par d챕faut. Vous devez 챕chapper les barres anti-obliques." #. type: Plain text #: en/git-cvsimport.txt:129 #, priority:100 msgid "The regex must capture the source branch name in $1." -msgstr "" +msgstr "La regex doit capturer le nom de la branche source dans $1." #. type: Plain text #: en/git-cvsimport.txt:131 #, priority:100 msgid "This option can be used several times to provide several detection regexes." -msgstr "" +msgstr "Cette option peut 챗tre utilis챕e plusieurs fois pour fournir plusieurs regexes de d챕tection." #. type: Labeled list #: en/git-cvsimport.txt:132 @@ -18571,37 +18571,37 @@ msgstr "-S <regex>" #: en/git-cvsimport.txt:134 #, priority:100 msgid "Skip paths matching the regex." -msgstr "" +msgstr "Ignorer les chemins correspondant 횪 l'expression r챕guli챔re." #. type: Plain text #: en/git-cvsimport.txt:138 #, priority:100 msgid "Import all commits, including recent ones. cvsimport by default skips commits that have a timestamp less than 10 minutes ago." -msgstr "" +msgstr "Importer tous les commits, y compris les plus r챕cents. cvsimport ignore par d챕faut les commits dont l'horodatage date de moins de 10 minutes." #. type: Labeled list #: en/git-cvsimport.txt:139 #, no-wrap, priority:100 msgid "-L <limit>" -msgstr "" +msgstr "-L <limite>" #. type: Plain text #: en/git-cvsimport.txt:142 #, priority:100 msgid "Limit the number of commits imported. Workaround for cases where cvsimport leaks memory." -msgstr "" +msgstr "Limiter le nombre de commits import챕s. Solution de contournement pour les cas o첫 cvsimport perd de la m챕moire." #. type: Labeled list #: en/git-cvsimport.txt:143 #, no-wrap, priority:100 msgid "-A <author-conv-file>" -msgstr "" +msgstr "-A <fichier-conv-auteur>" #. type: Plain text #: en/git-cvsimport.txt:148 #, priority:100 msgid "CVS by default uses the Unix username when writing its commit logs. Using this option and an author-conv-file maps the name recorded in CVS to author name, e-mail and optional time zone:" -msgstr "" +msgstr "CVS utilise par d챕faut le nom d'utilisateur Unix lors de l'챕criture de ses journaux de commit. L'utilisation de cette option et d'un fichier fichier-conv-auteur fait correspondre le nom enregistr챕 dans CVS au nom de l'auteur, 횪 son e-mail et 횪 son fuseau horaire optionnel :" #. type: delimited block - #: en/git-cvsimport.txt:152 @@ -18609,145 +18609,145 @@ msgstr "" msgid "" "\texon=Andreas Ericsson <ae@op5.se>\n" "\tspawn=Simon Pawn <spawn@frog-pond.org> America/Chicago\n" -msgstr "" +msgstr "\texon=Andreas Ericsson <ae@op5.se>\n\tspawn=Simon Pawn <spawn@frog-pond.org> America/Chicago\n" #. type: Plain text #: en/git-cvsimport.txt:159 #, priority:100 msgid "'git cvsimport' will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone is specified, GIT_AUTHOR_DATE will have the corresponding offset applied." -msgstr "" +msgstr "'git cvsimport' le fera appara챤tre comme si ces auteurs avaient leurs GIT_AUTHOR_NAME et GIT_AUTHOR_EMAIL correctement d챕finis depuis le d챕but. Si un fuseau horaire est sp챕cifi챕, GIT_AUTHOR_DATE aura le d챕calage correspondant appliqu챕." #. type: Plain text #: en/git-cvsimport.txt:163 #, priority:100 msgid "For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same file each time 'git cvsimport' is run." -msgstr "" +msgstr "Pour plus de commodit챕, ces donn챕es sont enregistr챕es dans '$GIT_DIR/cvs-authors' chaque fois que l�셭ption '-A' est fournie et lues 횪 partir de ce m챗me fichier chaque fois que 'git cvsimport' est ex챕cut챕." #. type: Plain text #: en/git-cvsimport.txt:167 #, priority:100 msgid "It is not recommended to use this feature if you intend to export changes back to CVS again later with 'git cvsexportcommit'." -msgstr "" +msgstr "Il n�셞st pas recommand챕 d�셵tiliser cette fonctionnalit챕 si vous avez l�셢ntention d�셞xporter 횪 nouveau les modifications vers CVS ult챕rieurement avec 'git cvsexportcommit'." #. type: Plain text #: en/git-cvsimport.txt:173 #, priority:100 msgid "Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS revision numbers to newly-created Git commit IDs. The generated file will contain one line for each (filename, revision) pair imported; each line will look like" -msgstr "" +msgstr "G챕n챕rer un fichier '$GIT_DIR/cvs-revisions' contenant un mappage des num챕ros de r챕vision CVS aux ID de validation Git nouvellement cr챕챕s. Le fichier g챕n챕r챕 contiendra une ligne pour chaque paire (nom de fichier, r챕vision) import챕e ; chaque ligne ressemblera 횪" #. type: delimited block - #: en/git-cvsimport.txt:176 #, no-wrap, priority:100 msgid "src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7\n" -msgstr "" +msgstr "src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7\n" #. type: Plain text #: en/git-cvsimport.txt:180 #, priority:100 msgid "The revision data is appended to the file if it already exists, for use when doing incremental imports." -msgstr "" +msgstr "Les donn챕es de r챕vision sont ajout챕es au fichier s�셢l existe d챕j횪, pour 챗tre utilis챕es lors des importations incr챕mentielles." #. type: Plain text #: en/git-cvsimport.txt:183 #, priority:100 msgid "This option may be useful if you have CVS revision numbers stored in commit messages, bug-tracking systems, email archives, and the like." -msgstr "" +msgstr "Cette option peut 챗tre utile si vous avez des num챕ros de r챕vision CVS stock챕s dans des messages de validation, des syst챔mes de suivi des bogues, des archives d�셞-mails, etc." #. type: Plain text #: en/git-cvsimport.txt:186 #, priority:100 msgid "Print a short usage message and exit." -msgstr "" +msgstr "Imprimer un petit message d'utilisation et de sortie." #. type: Plain text #: en/git-cvsimport.txt:190 #, priority:100 msgid "If `-v` is specified, the script reports what it is doing." -msgstr "" +msgstr "Si `-v` est sp챕cifi챕, le script indique ce qu�셢l fait." #. type: Plain text #: en/git-cvsimport.txt:193 #, priority:100 msgid "Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status." -msgstr "" +msgstr "Sinon, le succ챔s est indiqu챕 횪 la mani챔re Unix, c'est-횪-dire en sortant simplement avec un statut de sortie nul." #. type: Title - #: en/git-cvsimport.txt:196 #, no-wrap, priority:100 msgid "ISSUES" -msgstr "" +msgstr "PROBL횊MES" #. type: Plain text #: en/git-cvsimport.txt:198 #, priority:100 msgid "Problems related to timestamps:" -msgstr "" +msgstr "Probl챔mes li챕s 횪 l'horodatage :" #. type: Plain text #: en/git-cvsimport.txt:202 #, priority:100 msgid "If timestamps of commits in the CVS repository are not stable enough to be used for ordering commits changes may show up in the wrong order." -msgstr "" +msgstr "Si l'horodatage des commits dans le d챕p척t CVS n'est pas suffisamment stable pour 챗tre utilis챕 pour ordonner les commits, les modifications peuvent appara챤tre dans le mauvais ordre." #. type: Plain text #: en/git-cvsimport.txt:204 #, priority:100 msgid "If any files were ever \"cvs import\"ed more than once (e.g., import of more than one vendor release) the HEAD contains the wrong content." -msgstr "" +msgstr "Si des fichiers ont d챕j횪 챕t챕 \"cvs import\"챕s plus d'une fois (par exemple, l'importation de plusieurs versions de fournisseurs), le HEAD contient le mauvais contenu." #. type: Plain text #: en/git-cvsimport.txt:207 #, priority:100 msgid "If the timestamp order of different files cross the revision order within the commit matching time window the order of commits may be wrong." -msgstr "" +msgstr "Si l'ordre d'horodatage de diff챕rents fichiers croise l'ordre de r챕vision dans la fen챗tre de temps de correspondance des commits, l'ordre des commits peut 챗tre erron챕." #. type: Plain text #: en/git-cvsimport.txt:209 #, priority:100 msgid "Problems related to branches:" -msgstr "" +msgstr "Probl챔mes li챕s aux branches :" #. type: Plain text #: en/git-cvsimport.txt:211 #, priority:100 msgid "Branches on which no commits have been made are not imported." -msgstr "" +msgstr "Les branches sur lesquelles aucun commit n'a 챕t챕 effectu챕 ne sont pas import챕es." #. type: Plain text #: en/git-cvsimport.txt:213 #, priority:100 msgid "All files from the branching point are added to a branch even if never added in CVS." -msgstr "" +msgstr "Tous les fichiers du point de branchement sont ajout챕s 횪 une branche m챗me s'ils n'ont jamais 챕t챕 ajout챕s dans CVS." #. type: Plain text #: en/git-cvsimport.txt:216 #, priority:100 msgid "This applies to files added to the source branch *after* a daughter branch was created: if previously no commit was made on the daughter branch they will erroneously be added to the daughter branch in git." -msgstr "" +msgstr "Cela s'applique aux fichiers ajout챕s 횪 la branche source *apr챔s* la cr챕ation d'une branche fille : si aucun commit n'a 챕t챕 fait auparavant sur la branche fille, elles seront ajout챕es par erreur 횪 la branche fille dans git." #. type: Plain text #: en/git-cvsimport.txt:218 #, priority:100 msgid "Problems related to tags:" -msgstr "" +msgstr "Probl챔mes li챕s aux 챕tiquettes :" #. type: Plain text #: en/git-cvsimport.txt:220 #, priority:100 msgid "Multiple tags on the same revision are not imported." -msgstr "" +msgstr "Plusieurs 챕tiquettes sur la m챗me r챕vision ne sont pas import챕es." #. type: Plain text #: en/git-cvsimport.txt:223 #, priority:100 msgid "If you suspect that any of these issues may apply to the repository you want to import, consider using cvs2git:" -msgstr "" +msgstr "Si vous pensez que l'un de ces probl챔mes peut s'appliquer au d챕p척t que vous voulez importer, envisagez d'utiliser cvs2git :" #. type: Plain text #: en/git-cvsimport.txt:225 #, priority:100 msgid "cvs2git (part of cvs2svn), `http://subversion.apache.org/`" -msgstr "" +msgstr "cvs2git (partie de cvs2svn), `http://subversion.apache.org/`" #. type: Title = #: en/git-cvsserver.txt:2 @@ -18759,13 +18759,13 @@ msgstr "git-cvsserver(1)" #: en/git-cvsserver.txt:7 #, priority:100 msgid "git-cvsserver - A CVS server emulator for Git" -msgstr "" +msgstr "git-cvsserver - Un 챕mulateur de serveur CVS pour Git" #. type: Plain text #: en/git-cvsserver.txt:12 #, priority:100 msgid "SSH:" -msgstr "" +msgstr "SSH혻:" #. type: Plain text #: en/git-cvsserver.txt:16 @@ -18773,55 +18773,55 @@ msgstr "" msgid "" "export CVS_SERVER=\"git cvsserver\"\n" "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n" -msgstr "" +msgstr "export CVS_SERVER=\"git cvsserver\"\n'cvs' -d :ext:user@serveur/chemin/depot.git co <nom-HEAD>\n" #. type: Plain text #: en/git-cvsserver.txt:18 #, priority:100 msgid "pserver (/etc/inetd.conf):" -msgstr "" +msgstr "pserver (/etc/inetd.conf)혻:" #. type: Plain text #: en/git-cvsserver.txt:21 #, no-wrap, priority:100 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n" -msgstr "" +msgstr "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n" #. type: Plain text #: en/git-cvsserver.txt:23 #, priority:100 msgid "Usage:" -msgstr "" +msgstr "Utilisation :" #. type: Plain text #: en/git-cvsserver.txt:26 #, ignore-ellipsis, no-wrap, priority:100 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n" -msgstr "" +msgstr "'git-cvsserver' [<options>] [pserveur|serveur] [<r챕pertoire> ...]\n" #. type: Plain text #: en/git-cvsserver.txt:31 #, priority:100 msgid "This application is a CVS emulation layer for Git." -msgstr "" +msgstr "Cette application est une couche d'챕mulation CVS pour Git." #. type: Plain text #: en/git-cvsserver.txt:35 #, priority:100 msgid "It is highly functional. However, not all methods are implemented, and for those methods that are implemented, not all switches are implemented." -msgstr "" +msgstr "Elle est tr챔s fonctionnelle. Cependant, toutes les m챕thodes ne sont pas mises en 흹uvre, et pour les m챕thodes qui le sont, tous les drapeaux ne sont pas mis en 흹uvre." #. type: Plain text #: en/git-cvsserver.txt:38 #, priority:100 msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS plugin. Most functionality works fine with both of these clients." -msgstr "" +msgstr "Les tests ont 챕t챕 effectu챕s en utilisant 횪 la fois le client en ligne de commande CVS et le plugin CVS Eclipse. La plupart des fonctionnalit챕s fonctionnent bien avec ces deux clients." #. type: Plain text #: en/git-cvsserver.txt:45 #, priority:100 msgid "All these options obviously only make sense if enforced by the server side. They have been implemented to resemble the linkgit:git-daemon[1] options as closely as possible." -msgstr "" +msgstr "Toutes ces options n'ont 챕videmment de sens que si elles sont appliqu챕es du c척t챕 du serveur. Elles ont 챕t챕 impl챕ment챕es pour ressembler le plus possible aux options de linkgit:git-daemon[1]." #. type: Labeled list #: en/git-cvsserver.txt:46 @@ -18833,7 +18833,7 @@ msgstr "--base-path <chemin>" #: en/git-cvsserver.txt:48 #, priority:100 msgid "Prepend 'path' to requested CVSROOT" -msgstr "" +msgstr "pr챕fixer le CVSROOT demand챕 par 'chemin'" #. type: Labeled list #: en/git-cvsserver.txt:49 en/git-daemon.txt:49 @@ -18845,7 +18845,7 @@ msgstr "--strict-paths" #: en/git-cvsserver.txt:51 #, priority:100 msgid "Don't allow recursing into subdirectories" -msgstr "" +msgstr "Ne pas autoriser les r챕cursions dans les sous-r챕pertoires" #. type: Labeled list #: en/git-cvsserver.txt:52 en/git-daemon.txt:78 @@ -18857,13 +18857,13 @@ msgstr "--export-all" #: en/git-cvsserver.txt:55 #, priority:100 msgid "Don't check for `gitcvs.enabled` in config. You also have to specify a list of allowed directories (see below) if you want to use this option." -msgstr "" +msgstr "Ne pas v챕rifier `gitcvs.enabled` dans la configuration. Vous devez 챕galement sp챕cifier une liste de r챕pertoires autoris챕s (voir ci-dessous) si vous voulez utiliser cette option." #. type: Labeled list #: en/git-cvsserver.txt:56 #, no-wrap, priority:100 msgid "-V" -msgstr "" +msgstr "-V" #. type: Labeled list #: en/git-cvsserver.txt:57 en/git.txt:42 @@ -18875,7 +18875,7 @@ msgstr "--version" #: en/git-cvsserver.txt:59 #, priority:100 msgid "Print version information and exit" -msgstr "" +msgstr "Afficher les informations sur la version et quitter" #. type: Labeled list #: en/git-cvsserver.txt:62 en/git.txt:49 @@ -18887,67 +18887,67 @@ msgstr "--help" #: en/git-cvsserver.txt:64 #, priority:100 msgid "Print usage information and exit" -msgstr "" +msgstr "Afficher les informations d'utilisation et quitter" #. type: Plain text #: en/git-cvsserver.txt:70 #, priority:100 msgid "You can specify a list of allowed directories. If no directories are given, all are allowed. This is an additional restriction, gitcvs access still needs to be enabled by the `gitcvs.enabled` config option unless `--export-all` was given, too." -msgstr "" +msgstr "Vous pouvez sp챕cifier une liste de r챕pertoires autoris챕s. Si aucun r챕pertoire n'est donn챕, tous sont autoris챕s. Il s'agit d'une restriction suppl챕mentaire, l'acc챔s 횪 gitcvs doit toujours 챗tre activ챕 par l'option de configuration `gitcvs.enabled`, 횪 moins que `--export-all` ne soit 챕galement donn챕." #. type: Title - #: en/git-cvsserver.txt:73 en/git-fast-export.txt:272 #, no-wrap, priority:100 msgid "LIMITATIONS" -msgstr "" +msgstr "LIMITATIONS" #. type: Plain text #: en/git-cvsserver.txt:76 #, priority:100 msgid "CVS clients cannot tag, branch or perform Git merges." -msgstr "" +msgstr "Les clients CVS ne peuvent pas 챕tiqueter, faire des branches ou effectuer des fusions Git." #. type: Plain text #: en/git-cvsserver.txt:80 #, priority:100 msgid "'git-cvsserver' maps Git branches to CVS modules. This is very different from what most CVS users would expect since in CVS modules usually represent one or more directories." -msgstr "" +msgstr "'git-cvsserver' fait correspondre les branches Git aux modules CVS. C'est tr챔s diff챕rent de ce 횪 quoi la plupart des utilisateurs de CVS s'attendent puisque dans CVS, les modules repr챕sentent g챕n챕ralement un ou plusieurs r챕pertoires." #. type: Title - #: en/git-cvsserver.txt:82 #, no-wrap, priority:100 msgid "INSTALLATION" -msgstr "" +msgstr "INSTALLATION" #. type: Plain text #: en/git-cvsserver.txt:86 #, priority:100 msgid "If you are going to offer CVS access via pserver, add a line in /etc/inetd.conf like" -msgstr "" +msgstr "Si vous comptez offrir un acc챔s CVS via pserver, ajoutez une ligne dans /etc/inetd.conf comme suit" #. type: delimited block - #: en/git-cvsserver.txt:90 #, no-wrap, priority:100 msgid " cvspserver stream tcp nowait nobody git-cvsserver pserver\n" -msgstr "" +msgstr " cvspserver stream tcp nowait nobody git-cvsserver pserver\n" #. type: Plain text #: en/git-cvsserver.txt:96 #, priority:100 msgid "Note: Some inetd servers let you specify the name of the executable independently of the value of argv[0] (i.e. the name the program assumes it was executed with). In this case the correct line in /etc/inetd.conf looks like" -msgstr "" +msgstr "Note : Certains serveurs inetd vous permettent de sp챕cifier le nom de l'ex챕cutable ind챕pendamment de la valeur de argv[0] (c-횪-d le nom avec lequel le programme suppose avoir 챕t챕 ex챕cut챕). Dans ce cas, la ligne correcte dans le fichier /etc/inetd.conf est la suivante" #. type: delimited block - #: en/git-cvsserver.txt:99 #, no-wrap, priority:100 msgid " cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n" -msgstr "" +msgstr " cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n" #. type: Plain text #: en/git-cvsserver.txt:106 #, priority:100 msgid "Only anonymous access is provided by pserver by default. To commit you will have to create pserver accounts, simply add a gitcvs.authdb setting in the config file of the repositories you want the cvsserver to allow writes to, for example:" -msgstr "" +msgstr "Seul l'acc챔s anonyme est fourni par pserver par d챕faut. Pour valider, vous devrez cr챕er des comptes pserver, il suffit d'ajouter un param챔tre gitcvs.authdb dans le fichier de configuration des d챕p척ts pour lesquels vous voulez que le cvsserver autorise les 챕critures, par exemple :" #. type: delimited block - #: en/git-cvsserver.txt:111 @@ -18955,13 +18955,13 @@ msgstr "" msgid "" " [gitcvs]\n" "\tauthdb = /etc/cvsserver/passwd\n" -msgstr "" +msgstr " [gitcvs]\n\tauthdb = /etc/cvsserver/passwd\n" #. type: Plain text #: en/git-cvsserver.txt:115 #, priority:100 msgid "The format of these files is username followed by the encrypted password, for example:" -msgstr "" +msgstr "Le format de ces fichiers est le nom d'utilisateur suivi du mot de passe crypt챕, par exemple :" #. type: delimited block - #: en/git-cvsserver.txt:120 @@ -18970,61 +18970,61 @@ msgid "" " myuser:sqkNi8zPf01HI\n" " myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/\n" " myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3\n" -msgstr "" +msgstr " monutilisateur:sqkNi8zPf01HI\n monutilisateur:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/\n monutilisateur:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3\n" #. type: Plain text #: en/git-cvsserver.txt:123 #, priority:100 msgid "You can use the 'htpasswd' facility that comes with Apache to make these files, but only with the -d option (or -B if your system suports it)." -msgstr "" +msgstr "Vous pouvez utiliser la fonction 'htpasswd' fournie avec Apache pour cr챕er ces fichiers, mais uniquement avec l'option -d (ou -B si votre syst챔me la prend en charge)." #. type: Plain text #: en/git-cvsserver.txt:127 #, priority:100 msgid "Preferably use the system specific utility that manages password hash creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or pwhash in NetBSD) and paste it in the right location." -msgstr "" +msgstr "Utilisez de pr챕f챕rence l'utilitaire sp챕cifique au syst챔me qui g챔re la cr챕ation du hachage du mot de passe sur votre plate-forme (par exemple, mkpasswd sous Linux, encrypt sous OpenBSD ou pwhash sous NetBSD) et collez-le au bon endroit." #. type: Plain text #: en/git-cvsserver.txt:129 #, priority:100 msgid "Then provide your password via the pserver method, for example:" -msgstr "" +msgstr "Ensuite, fournissez votre mot de passe via la m챕thode pserver, par exemple :" #. type: delimited block - #: en/git-cvsserver.txt:131 #, no-wrap, priority:100 msgid " cvs -d:pserver:someuser:somepassword@server:/path/repo.git co <HEAD_name>\n" -msgstr "" +msgstr " cvs -d:pserver:unutilisateur:unmotdepasse@serveur:/chemin/depot.git co <nom_de_HEAD>\n" #. type: Plain text #: en/git-cvsserver.txt:135 #, priority:100 msgid "No special setup is needed for SSH access, other than having Git tools in the PATH. If you have clients that do not accept the CVS_SERVER environment variable, you can rename 'git-cvsserver' to `cvs`." -msgstr "" +msgstr "Aucune configuration particuli챔re n'est n챕cessaire pour l'acc챔s SSH, si ce n'est d'avoir les outils Git dans le PATH. Si vous avez des clients qui n'acceptent pas la variable d'environnement CVS_SERVER, vous pouvez renommer 'git-cvsserver' ; en `cvs`." #. type: Plain text #: en/git-cvsserver.txt:138 #, priority:100 msgid "Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like" -msgstr "" +msgstr "Note : Les versions plus r챕centes de CVS (>= 1.12.11) supportent 챕galement la sp챕cification de CVS_SERVER directement dans CVSROOT comme" #. type: delimited block - #: en/git-cvsserver.txt:141 #, no-wrap, priority:100 msgid " cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co <HEAD_name>\n" -msgstr "" +msgstr " cvs -d \":ext;CVS_SERVER=git cvsserver:utilisateur@serveur/chemin/depot.git\" co <nom_HEAD>\n" #. type: Plain text #: en/git-cvsserver.txt:147 #, priority:100 msgid "This has the advantage that it will be saved in your 'CVS/Root' files and you don't need to worry about always setting the correct environment variable. SSH users restricted to 'git-shell' don't need to override the default with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean 'git-cvsserver' and pretends that the other end runs the real 'cvs' better." -msgstr "" +msgstr "Cela pr챕sente l'avantage d'챗tre enregistr챕 dans vos fichiers 'CVS/Root' ; et vous n'avez pas besoin de vous soucier de toujours d챕finir la bonne variable d'environnement. Les utilisateurs SSH limit챕s 횪 'git-shell' n'ont pas besoin de remplacer la valeur par d챕faut par CVS_SERVER (et ne devraient pas le faire) car 'git-shell' comprend que `cvs` signifie 'git-cvsserver' et pr챕tend que l'autre extr챕mit챕 ex챕cute mieux le vrai 'cvs' ;." #. type: Plain text #: en/git-cvsserver.txt:150 #, priority:100 msgid "For each repo that you want accessible from CVS you need to edit config in the repo and add the following section." -msgstr "" +msgstr "Pour chaque d챕p척t que vous souhaitez rendre accessible depuis CVS, vous devez modifier la configuration du d챕p척t et ajouter la section suivante." #. type: delimited block - #: en/git-cvsserver.txt:157 @@ -19034,25 +19034,25 @@ msgid "" " enabled=1\n" " # optional for debugging\n" "\tlogFile=/path/to/logfile\n" -msgstr "" +msgstr " [gitcvs]\n enabled=1\n # optionnel pour le d챕bogage\n\tlogFile=/chemin/vers/fichierjournal\n" #. type: Plain text #: en/git-cvsserver.txt:163 #, priority:100 msgid "Note: you need to ensure each user that is going to invoke 'git-cvsserver' has write access to the log file and to the database (see <<dbbackend,Database Backend>>. If you want to offer write access over SSH, the users of course also need write access to the Git repository itself." -msgstr "" +msgstr "Note : vous devez vous assurer que chaque utilisateur qui va invoquer 'git-cvsserver' a un acc챔s en 챕criture au fichier journal et 횪 la base de donn챕es (voir <<dbbackend,Moteur de base de donn챕es>>). Si vous souhaitez offrir un acc챔s en 챕criture via SSH, les utilisateurs doivent bien s청r 챕galement disposer d'un acc챔s en 챕criture au d챕p척t Git lui-m챗me." #. type: Plain text #: en/git-cvsserver.txt:166 #, priority:100 msgid "You also need to ensure that each repository is \"bare\" (without a Git index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]." -msgstr "" +msgstr "Vous devez 챕galement vous assurer que chaque d챕p척t est nu \"bare\" (sans fichier d'index Git) pour que `cvs commit` fonctionne. Voir linkgit:gitcvs-migration[7]." #. type: Plain text #: en/git-cvsserver.txt:172 #, priority:100 msgid "All configuration variables can also be overridden for a specific method of access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The following example configuration would disable pserver access while still allowing access over SSH." -msgstr "" +msgstr "Toutes les variables de configuration peuvent 챕galement 챗tre remplac챕es pour une m챕thode d'acc챔s sp챕cifique. Les noms de m챕thode valides sont \"ext\" (pour l'acc챔s SSH) et \"pserver\". L'exemple de configuration suivant d챕sactiverait l'acc챔s via pserver tout en autorisant l'acc챔s via SSH." #. type: delimited block - #: en/git-cvsserver.txt:175 @@ -19060,7 +19060,7 @@ msgstr "" msgid "" " [gitcvs]\n" " enabled=0\n" -msgstr "" +msgstr " [gitcvs]\n enabled=0\n" #. type: delimited block - #: en/git-cvsserver.txt:178 @@ -19068,13 +19068,13 @@ msgstr "" msgid "" " [gitcvs \"ext\"]\n" " enabled=1\n" -msgstr "" +msgstr " [gitcvs \"ext\"]\n enabled=1\n" #. type: Plain text #: en/git-cvsserver.txt:185 #, priority:100 msgid "If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command, automatically saving it in your 'CVS/Root' files, then you need to set them explicitly in your environment. CVSROOT should be set as per normal, but the directory should point at the appropriate Git repo. As above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be set to 'git-cvsserver'." -msgstr "" +msgstr "Si vous n�셙vez pas sp챕cifi챕 le CVSROOT/CVS_SERVER directement dans la commande checkout, en l�셞nregistrant automatiquement dans vos fichiers 'CVS/Root', vous devez les d챕finir explicitement dans votre environnement. CVSROOT doit 챗tre d챕fini comme d�셡abitude, mais le r챕pertoire doit pointer vers le d챕p척t Git appropri챕. Comme ci-dessus, pour les clients SSH _non_ limit챕s 횪 'git-shell', CVS_SERVER doit 챗tre d챕fini sur 'git-cvsserver'." #. type: delimited block - #: en/git-cvsserver.txt:190 @@ -19082,157 +19082,157 @@ msgstr "" msgid "" " export CVSROOT=:ext:user@server:/var/git/project.git\n" " export CVS_SERVER=\"git cvsserver\"\n" -msgstr "" +msgstr " export CVSROOT=:ext:utilisateur@serveur:/var/git/projet.git\n export CVS_SERVER=\"git cvsserver\"\n" #. type: Plain text #: en/git-cvsserver.txt:197 #, priority:100 msgid "For SSH clients that will make commits, make sure their server-side .ssh/environment files (or .bashrc, etc., according to their specific shell) export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login shell is bash, .bashrc may be a reasonable alternative." -msgstr "" +msgstr "Pour les clients SSH qui feront des commits, assurez-vous que leurs fichiers .ssh/environnement c척t챕 serveur (ou .bashrc, etc., selon leur shell sp챕cifique) exportent les valeurs appropri챕es pour GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_COMMITTER_NAME et GIT_COMMITTER_EMAIL. Pour les clients SSH dont le shell de connexion est bash, .bashrc peut 챗tre une alternative raisonnable." #. type: Plain text #: en/git-cvsserver.txt:203 #, priority:100 msgid "Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with `-d <dir_name>`. For example, this checks out 'master' branch to the `project-master` directory:" -msgstr "" +msgstr "Les clients devraient maintenant pouvoir extraire le projet. Utilisez le nom du 'module' CVS pour indiquer quel 'head' Git vous voulez extraire. Ceci d챕finit 챕galement le nom de votre r챕pertoire nouvellement extrait, 횪 moins que vous ne l'indiquiez autrement avec `-d <nom_r챕pertoire>`. Par exemple, ceci extrait la branche 'master' dans le r챕pertoire `master-projet` :" #. type: delimited block - #: en/git-cvsserver.txt:206 #, no-wrap, priority:100 msgid " cvs co -d project-master master\n" -msgstr "" +msgstr " cvs co -d master-projet master\n" #. type: Title - #: en/git-cvsserver.txt:210 #, no-wrap, priority:100 msgid "DATABASE BACKEND" -msgstr "" +msgstr "MOTEUR DE BASE DE DONN횋ES" #. type: Plain text #: en/git-cvsserver.txt:216 #, priority:100 msgid "'git-cvsserver' uses one database per Git head (i.e. CVS module) to store information about the repository to maintain consistent CVS revision numbers. The database needs to be updated (i.e. written to) after every commit." -msgstr "" +msgstr "'git-cvsserver' utilise une base de donn챕es par t챗te Git (c'est-횪-dire le module CVS) pour stocker des informations sur le d챕p척t afin de maintenir des num챕ros de r챕vision CVS coh챕rents. La base de donn챕es doit 챗tre mise 횪 jour (c'est-횪-dire 챕crite) apr챔s chaque validation." #. type: Plain text #: en/git-cvsserver.txt:221 #, priority:100 msgid "If the commit is done directly by using `git` (as opposed to using 'git-cvsserver') the update will need to happen on the next repository access by 'git-cvsserver', independent of access method and requested operation." -msgstr "" +msgstr "Si le commit est effectu챕 directement en utilisant `git` (par opposition 횪 l'utilisation de 'git-cvsserver'), la mise 횪 jour devra se produire lors du prochain acc챔s au d챕p척t par 'git-cvsserver', ind챕pendamment de la m챕thode d'acc챔s et de l'op챕ration demand챕e." #. type: Plain text #: en/git-cvsserver.txt:226 #, priority:100 msgid "That means that even if you offer only read access (e.g. by using the pserver method), 'git-cvsserver' should have write access to the database to work reliably (otherwise you need to make sure that the database is up to date any time 'git-cvsserver' is executed)." -msgstr "" +msgstr "Cela signifie que m챗me si vous n'offrez qu'un acc챔s en lecture (par exemple en utilisant la m챕thode pserver), 'git-cvsserver' doit avoir un acc챔s en 챕criture 횪 la base de donn챕es pour fonctionner de mani챔re fiable (sinon vous devez vous assurer que la base de donn챕es est 횪 jour 횪 chaque fois que 'git-cvsserver' est ex챕cut챕)." #. type: Plain text #: en/git-cvsserver.txt:233 #, priority:100 msgid "By default it uses SQLite databases in the Git directory, named `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using 'git-cvsserver' write access to the database file without granting them write access to the directory, too." -msgstr "" +msgstr "Par d챕faut, il utilise des bases de donn챕es SQLite dans le r챕pertoire Git, nomm챕es `gitcvs.<nom-de-module>.sqlite`. Notez que le moteur SQLite cr챕e des fichiers temporaires dans le m챗me r챕pertoire que le fichier de base de donn챕es lors de l'챕criture. Il pourrait donc ne pas 챗tre suffisant d'accorder aux utilisateurs utilisant 'git-cvsserver' un acc챔s en 챕criture au fichier de base de donn챕es sans leur accorder 챕galement un acc챔s en 챕criture au r챕pertoire." #. type: Plain text #: en/git-cvsserver.txt:245 #, priority:100 msgid "The database cannot be reliably regenerated in a consistent form after the branch it is tracking has changed. Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an incrementally updated database may track a different branch than a database regenerated from scratch, causing inconsistent CVS revision numbers. `git-cvsserver` has no way of knowing which branch it would have picked if it had been run incrementally pre-merge. So if you have to fully or partially (from old backup) regenerate the database, you should be suspicious of pre-existing CVS sandboxes." -msgstr "" +msgstr "La base de donn챕es ne peut pas 챗tre r챕g챕n챕r챕e de mani챔re fiable sous une forme coh챕rente apr챔s que la branche qu'elle suit a chang챕. Exemple : pour les branches fusionn챕es, 'git-cvsserver' ne suit qu'une branche de d챕veloppement, et apr챔s un 'git merge' une base de donn챕es mise 횪 jour de mani챔re incr챕mentielle peut suivre une branche diff챕rente de celle d'une base de donn챕es r챕g챕n챕r챕e 횪 partir de z챕ro, ce qui entra챤ne des num챕ros de r챕vision CVS incoh챕rents. `git-cvsserver` n'a aucun moyen de savoir quelle branche il aurait choisie s'il avait 챕t챕 lanc챕 de mani챔re incr챕mentale avant la fusion. Donc si vous devez r챕g챕n챕rer enti챔rement ou partiellement (횪 partir d'une ancienne sauvegarde) la base de donn챕es, vous devez vous m챕fier des bacs 횪 sable CVS pr챕existants." #. type: Plain text #: en/git-cvsserver.txt:248 #, priority:100 msgid "You can configure the database backend with the following configuration variables:" -msgstr "" +msgstr "Vous pouvez configurer le moteur de la base de donn챕es avec les variables de configuration suivantes :" #. type: Title ~ #: en/git-cvsserver.txt:250 #, no-wrap, priority:100 msgid "Configuring database backend" -msgstr "" +msgstr "Configuration du moteur de la base de donn챕es" #. type: Plain text #: en/git-cvsserver.txt:255 #, priority:100 msgid "'git-cvsserver' uses the Perl DBI module. Please also read its documentation if changing these variables, especially about `DBI->connect()`." -msgstr "" +msgstr "'git-cvsserver' utilise le module Perl DBI. Veuillez 챕galement lire sa documentation si vous modifiez ces variables, en particulier 횪 propos de `DBI->connect()`." #. type: Labeled list #: en/git-cvsserver.txt:256 #, no-wrap, priority:100 msgid "gitcvs.dbName" -msgstr "" +msgstr "gitcvs.dbName" #. type: Plain text #: en/git-cvsserver.txt:262 #, priority:100 msgid "Database name. The exact meaning depends on the selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'" -msgstr "" +msgstr "Nom de la base de donn챕es. La signification exacte d챕pend du pilote de base de donn챕es s챕lectionn챕, pour SQLite il s'agit d'un nom de fichier. Supporte la substitution de variables (voir ci-dessous). Ne peut pas contenir de point-virgule (`;`). Valeur par d챕faut : '%Ggitcvs.%m.sqlite'" #. type: Labeled list #: en/git-cvsserver.txt:263 #, no-wrap, priority:100 msgid "gitcvs.dbDriver" -msgstr "" +msgstr "gitcvs.dbDriver" #. type: Plain text #: en/git-cvsserver.txt:271 #, priority:100 msgid "Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard this as an experimental feature. May not contain colons (`:`). Default: 'SQLite'" -msgstr "" +msgstr "Pilote DBI utilis챕. Vous pouvez sp챕cifier n'importe quel pilote disponible ici, mais il est possible qu'il ne fonctionne pas. cvsserver a 챕t챕 test챕 avec 'DBD::SQLite', il a 챕t챕 signal챕 comme fonctionnant avec 'DBD::Pg' et il a 챕t챕 signal챕 comme ne fonctionnant *pas* avec 'DBD::mysql'. Veuillez consid챕rer ceci comme une fonctionnalit챕 exp챕rimentale. Ne peut pas contenir de deux-points (`:`). Valeur par d챕faut : 'SQLite'" #. type: Labeled list #: en/git-cvsserver.txt:272 #, no-wrap, priority:100 msgid "gitcvs.dbuser" -msgstr "" +msgstr "gitcvs.dbuser" #. type: Plain text #: en/git-cvsserver.txt:276 #, priority:100 msgid "Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below)." -msgstr "" +msgstr "Utilisateur de la base de donn챕es. Seulement utile si vous d챕finissez `dbDriver`, puisque SQLite n'a pas de concept d'utilisateur de base de donn챕es. Supporte la substitution de variables (voir ci-dessous)." #. type: Labeled list #: en/git-cvsserver.txt:277 #, no-wrap, priority:100 msgid "gitcvs.dbPass" -msgstr "" +msgstr "gitcvs.dbPass" #. type: Plain text #: en/git-cvsserver.txt:280 #, priority:100 msgid "Database password. Only useful if setting `dbDriver`, since SQLite has no concept of database passwords." -msgstr "" +msgstr "Mot de passe de la base de donn챕es. Seulement utile si vous d챕finissez `dbDriver`, puisque SQLite n'a pas de concept de mot de passe de base de donn챕es." #. type: Labeled list #: en/git-cvsserver.txt:281 #, no-wrap, priority:100 msgid "gitcvs.dbTableNamePrefix" -msgstr "" +msgstr "gitcvs.dbTableNamePrefix" #. type: Plain text #: en/git-cvsserver.txt:285 #, priority:100 msgid "Database table name prefix. Supports variable substitution (see below). Any non-alphabetic characters will be replaced with underscores." -msgstr "" +msgstr "Pr챕fixe du nom de la table de la base de donn챕es. Supporte la substitution de variables (voir ci-dessous). Tout caract챔re non alphab챕tique sera remplac챕 par un trait de soulignement." #. type: Plain text #: en/git-cvsserver.txt:287 #, priority:100 msgid "All variables can also be set per access method, see <<configaccessmethod,above>>." -msgstr "" +msgstr "Toutes les variables peuvent 챕galement 챗tre d챕finies par m챕thode d'acc챔s, voir <<configaccessmethod,ci-dessus>>." #. type: Title ^ #: en/git-cvsserver.txt:289 #, no-wrap, priority:100 msgid "Variable substitution" -msgstr "" +msgstr "Substitution de variables" #. type: Plain text #: en/git-cvsserver.txt:291 #, priority:100 msgid "In `dbDriver` and `dbUser` you can use the following variables:" -msgstr "" +msgstr "Dans `dbDriver` et `dbUser`, vous pouvez utiliser les variables suivantes :" #. type: Labeled list #: en/git-cvsserver.txt:292 @@ -19244,7 +19244,7 @@ msgstr "%G" #: en/git-cvsserver.txt:294 #, priority:100 msgid "Git directory name" -msgstr "" +msgstr "Nom du r챕pertoire Git" #. type: Labeled list #: en/git-cvsserver.txt:294 @@ -19256,7 +19256,7 @@ msgstr "%g" #: en/git-cvsserver.txt:299 #, priority:100 msgid "Git directory name, where all characters except for alphanumeric ones, `.`, and `-` are replaced with `_` (this should make it easier to use the directory name in a filename if wanted)" -msgstr "" +msgstr "Nom du r챕pertoire Git, o첫 tous les caract챔res sauf les alphanum챕riques, `.`, et `-` sont remplac챕s par `_` (cela devrait rendre plus facile l'utilisation du nom du r챕pertoire dans un nom de fichier si on le souhaite)" #. type: Labeled list #: en/git-cvsserver.txt:299 @@ -19268,7 +19268,7 @@ msgstr "%m" #: en/git-cvsserver.txt:301 #, priority:100 msgid "CVS module/Git head name" -msgstr "" +msgstr "Nom du module CVS/head Git" #. type: Labeled list #: en/git-cvsserver.txt:301 @@ -19280,7 +19280,7 @@ msgstr "%a" #: en/git-cvsserver.txt:303 #, priority:100 msgid "access method (one of \"ext\" or \"pserver\")" -msgstr "" +msgstr "m챕thode d'acc챔s (l'une des m챕thodes suivantes : \"ext\" ou \"pserver\")" #. type: Labeled list #: en/git-cvsserver.txt:303 @@ -19292,109 +19292,109 @@ msgstr "%u" #: en/git-cvsserver.txt:307 #, priority:100 msgid "Name of the user running 'git-cvsserver'. If no name can be determined, the numeric uid is used." -msgstr "" +msgstr "Nom de l'utilisateur qui ex챕cute 'git-cvsserver'. Si aucun nom ne peut 챗tre d챕termin챕, l'uid num챕rique est utilis챕." #. type: Plain text #: en/git-cvsserver.txt:313 #, priority:100 msgid "These variables obviate the need for command-line options in some circumstances, allowing easier restricted usage through git-shell." -msgstr "" +msgstr "Ces variables rendent inutile l'utilisation d'options en ligne de commande dans certaines circonstances, ce qui permet un usage restreint plus facile via git-shell." #. type: Plain text #: en/git-cvsserver.txt:315 #, priority:100 msgid "GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path." -msgstr "" +msgstr "GIT_CVSSERVER_BASE_PATH prend la place de l'argument de --base-path." #. type: Plain text #: en/git-cvsserver.txt:319 #, priority:100 msgid "GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository must still be configured to allow access through git-cvsserver, as described above." -msgstr "" +msgstr "GIT_CVSSERVER_ROOT sp챕cifie une liste blanche 횪 r챕pertoire unique. Le d챕p척t doit toujours 챗tre configur챕 pour permettre l'acc챔s via git-cvsserver, comme d챕crit ci-dessus." #. type: Plain text #: en/git-cvsserver.txt:322 #, priority:100 msgid "When these environment variables are set, the corresponding command-line arguments may not be used." -msgstr "" +msgstr "Lorsque ces variables d�셞nvironnement sont d챕finies, les arguments de ligne de commande correspondants peuvent ne pas 챗tre utilis챕s." #. type: Title - #: en/git-cvsserver.txt:324 #, no-wrap, priority:100 msgid "ECLIPSE CVS CLIENT NOTES" -msgstr "" +msgstr "NOTES POUR LE CLIENT ECLIPSE CVS" #. type: Plain text #: en/git-cvsserver.txt:327 #, priority:100 msgid "To get a checkout with the Eclipse CVS client:" -msgstr "" +msgstr "Pour obtenir une extraction avec le client CVS d'Eclipse :" #. type: Plain text #: en/git-cvsserver.txt:329 #, priority:100 msgid "Select \"Create a new project -> From CVS checkout\"" -msgstr "" +msgstr "S챕lectionnez \"Create a new project -> From CVS checkout\"" #. type: Plain text #: en/git-cvsserver.txt:331 #, priority:100 msgid "Create a new location. See the notes below for details on how to choose the right protocol." -msgstr "" +msgstr "Cr챕ez un nouvel emplacement. Consultez les notes ci-dessous pour savoir comment choisir le bon protocole." #. type: Plain text #: en/git-cvsserver.txt:334 #, priority:100 msgid "Browse the 'modules' available. It will give you a list of the heads in the repository. You will not be able to browse the tree from there. Only the heads." -msgstr "" +msgstr "Parcourez les 'modules' disponibles. Cela vous donnera une liste des t챗tes dans le d챕p척t. Vous ne pourrez pas parcourir l'arbre 횪 partir de l횪. Seulement les t챗tes." #. type: Plain text #: en/git-cvsserver.txt:336 #, priority:100 msgid "Pick `HEAD` when it asks what branch/tag to check out. Untick the \"launch commit wizard\" to avoid committing the .project file." -msgstr "" +msgstr "Choisissez `HEAD` pour la branche/챕tiquette 횪 extraire. D챕cochez la case \"launch commit wizard\" pour 챕viter de valider le fichier .project." #. type: Plain text #: en/git-cvsserver.txt:342 #, priority:100 msgid "Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to \"`git cvsserver`\". Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup." -msgstr "" +msgstr "Notes sur le protocole : si vous utilisez un acc챔s anonyme via pserver, il suffit de le s챕lectionner. Ceux qui utilisent un acc챔s SSH doivent choisir le protocole 'ext' et configurer l'acc챔s 'ext' dans le panneau Preferences->Team->CVS->ExtConnection. D챕finissez CVS_SERVER 횪 \"`git cvsserver`\". Notez que la prise en charge des mots de passe n'est pas bonne lorsque vous utilisez 'ext' vous voudrez certainement avoir des cl챕s SSH configur챕es." #. type: Plain text #: en/git-cvsserver.txt:347 #, priority:100 msgid "Alternatively, you can just use the non-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace the cvs utility on the server with 'git-cvsserver' or manipulate your `.bashrc` so that calling 'cvs' effectively calls 'git-cvsserver'." -msgstr "" +msgstr "Alternativement, vous pouvez simplement utiliser le protocole non standard extssh que Eclipse propose. Dans ce cas, CVS_SERVER est ignor챕, et vous devrez remplacer l'utilitaire cvs sur le serveur par 'git-cvsserver' ou manipuler votre `.bashrc` pour que l'appel 횪 'cvs' appelle effectivement 'git-cvsserver'." #. type: Title - #: en/git-cvsserver.txt:349 #, no-wrap, priority:100 msgid "CLIENTS KNOWN TO WORK" -msgstr "" +msgstr "CLIENTS CONNUS POUR FONCTIONNER" #. type: Plain text #: en/git-cvsserver.txt:352 #, priority:100 msgid "CVS 1.12.9 on Debian" -msgstr "" +msgstr "CVS 1.12.9 sur Debian" #. type: Plain text #: en/git-cvsserver.txt:353 #, priority:100 msgid "CVS 1.11.17 on MacOSX (from Fink package)" -msgstr "" +msgstr "CVS 1.11.17 sur MacOSX (횪 partir du paquet Fink)" #. type: Plain text #: en/git-cvsserver.txt:354 #, priority:100 msgid "Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)" -msgstr "" +msgstr "Eclipse 3.0, 3.1.2 sur MacOSX (voir les notes sur le client CVS d'Eclipse)" #. type: Plain text #: en/git-cvsserver.txt:355 #, priority:100 msgid "TortoiseCVS" -msgstr "" +msgstr "TortoiseCVS" #. type: Title - #: en/git-cvsserver.txt:357 @@ -19406,73 +19406,73 @@ msgstr "OP횋RATIONS SUPPORT횋ES" #: en/git-cvsserver.txt:361 #, priority:100 msgid "All the operations required for normal use are supported, including checkout, diff, status, update, log, add, remove, commit." -msgstr "" +msgstr "Toutes les op챕rations n챕cessaires 횪 une utilisation normale sont prises en charge, y compris l'extraction, la comparaison, l'챕tat, la mise 횪 jour, le journal, l'ajout, la suppression et la validation." #. type: Plain text #: en/git-cvsserver.txt:370 #, priority:100 msgid "Most CVS command arguments that read CVS tags or revision numbers (typically -r) work, and also support any git refspec (tag, branch, commit ID, etc). However, CVS revision numbers for non-default branches are not well emulated, and cvs log does not show tags or branches at all. (Non-main-branch CVS revision numbers superficially resemble CVS revision numbers, but they actually encode a git commit ID directly, rather than represent the number of revisions since the branch point.)" -msgstr "" +msgstr "La plupart des arguments de commande CVS qui lisent les 챕tiquettes CVS ou les num챕ros de r챕vision (typiquement -r) fonctionnent, et supportent 챕galement n'importe quel sp챕cificateur de r챕f챕rence git (챕tiquette, branche, ID de commit, etc). Cependant, les num챕ros de r챕vision CVS pour les branches non-d챕finies par d챕faut ne sont pas bien 챕mul챕s, et cvs log n'affiche pas du tout les 챕tiquettes ou les branches. (Les num챕ros de r챕vision CVS des branches non principales ressemblent superficiellement aux num챕ros de r챕vision CVS, mais ils encodent en fait directement un ID de commit git, plut척t que de repr챕senter le nombre de r챕visions depuis le point de branchement)." #. type: Plain text #: en/git-cvsserver.txt:384 #, priority:100 msgid "Note that there are two ways to checkout a particular branch. As described elsewhere on this page, the \"module\" parameter of cvs checkout is interpreted as a branch name, and it becomes the main branch. It remains the main branch for a given sandbox even if you temporarily make another branch sticky with cvs update -r. Alternatively, the -r argument can indicate some other branch to actually checkout, even though the module is still the \"main\" branch. Tradeoffs (as currently implemented): Each new \"module\" creates a new database on disk with a history for the given module, and after the database is created, operations against that main branch are fast. Or alternatively, -r doesn't take any extra disk space, but may be significantly slower for many operations, like cvs update." -msgstr "" +msgstr "Notez qu'il y a deux fa챌ons d'extraire une branche particuli챔re. Comme d챕crit ailleurs sur cette page, le param챔tre \"module\" de cvs checkout est interpr챕t챕 comme un nom de branche, et il devient la branche principale. Elle reste la branche principale pour un bac 횪 sable donn챕 m챗me si vous rendez temporairement une autre branche collante avec cvs update -r. Alternativement, l'argument -r peut indiquer une autre branche 횪 v챕rifier, m챗me si le module est toujours la branche \"principale\". Compromis (tel qu'impl챕ment챕 actuellement) : chaque nouveau \"module\" cr챕e une nouvelle base de donn챕es sur le disque avec un historique pour le module donn챕, et apr챔s la cr챕ation de la base de donn챕es, les op챕rations sur cette branche principale sont rapides. Ou alternativement, -r ne prend pas d'espace disque suppl챕mentaire, mais peut 챗tre significativement plus lent pour de nombreuses op챕rations, comme cvs update." #. type: Plain text #: en/git-cvsserver.txt:397 #, priority:100 msgid "If you want to refer to a git refspec that has characters that are not allowed by CVS, you have two options. First, it may just work to supply the git refspec directly to the appropriate CVS -r argument; some CVS clients don't seem to do much sanity checking of the argument. Second, if that fails, you can use a special character escape mechanism that only uses characters that are valid in CVS tags. A sequence of 4 or 5 characters of the form (underscore (`\"_\"`), dash (`\"-\"`), one or two characters, and dash (`\"-\"`)) can encode various characters based on the one or two letters: `\"s\"` for slash (`\"/\"`), `\"p\"` for period (`\".\"`), `\"u\"` for underscore (`\"_\"`), or two hexadecimal digits for any byte value at all (typically an ASCII number, or perhaps a part of a UTF-8 encoded character)." -msgstr "" +msgstr "Si vous voulez faire r챕f챕rence 횪 une sp챕cification de r챕f챕rence git qui contient des caract챔res non autoris챕s par CVS, vous avez deux options. Premi챔rement, il est possible de fournir la sp챕cification de r챕f챕rence git directement 횪 l'argument CVS -r appropri챕 ; certains clients CVS ne semblent pas faire beaucoup de v챕rification de l'int챕grit챕 de l'argument. Deuxi챔mement, si cela 챕choue, vous pouvez utiliser un m챕canisme sp챕cial d'챕chappement de caract챔res qui n'utilise que les caract챔res valides dans les 챕tiquettes CVS. Une s챕quence de 4 ou 5 caract챔res de la forme (trait de soulignement (`\"_\"`), tiret (`\"-\"`), un ou deux caract챔res, et tiret (`\"-\"`)) peut coder divers caract챔res bas챕s sur les une ou deux lettres : `\"s\"` pour la barre oblique (`\"/\"`), `\"p\"` pour le point (`\" .\"`), `\"u\"` pour le trait de soulignement (`\"_\"`), ou deux chiffres hexad챕cimaux pour toute valeur d'octet (typiquement un nombre ASCII, ou peut-챗tre une partie d'un caract챔re cod챕 UTF-8)." #. type: Plain text #: en/git-cvsserver.txt:400 #, priority:100 msgid "Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage." -msgstr "" +msgstr "Les anciennes op챕rations de surveillance ne sont pas prises en charge (챕dition, surveillance et connexes). Les exportations et l'챕tiquetage (챕tiquettes et branches) ne sont pas support챕s 횪 ce stade." #. type: Title ~ #: en/git-cvsserver.txt:402 #, no-wrap, priority:100 msgid "CRLF Line Ending Conversions" -msgstr "" +msgstr "Conversions de fin de ligne CRLF" #. type: Plain text #: en/git-cvsserver.txt:407 #, priority:100 msgid "By default the server leaves the `-k` mode blank for all files, which causes the CVS client to treat them as a text files, subject to end-of-line conversion on some platforms." -msgstr "" +msgstr "Par d챕faut, le serveur laisse le mode `-k` vide pour tous les fichiers, ce qui am챔ne le client CVS 횪 les traiter comme des fichiers texte, sujets 횪 une conversion de fin de ligne sur certaines plateformes." #. type: Plain text #: en/git-cvsserver.txt:412 #, priority:100 msgid "You can make the server use the end-of-line conversion attributes to set the `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. See linkgit:gitattributes[5] for more information about end-of-line conversion." -msgstr "" +msgstr "Vous pouvez faire en sorte que le serveur utilise les attributs de conversion de fin de ligne pour d챕finir les modes `-k` des fichiers en d챕finissant la variable de configuration `gitcvs.usecrlfattr`. Voir linkgit:gitattributes[5] pour plus d'informations sur la conversion de fin de ligne." #. type: Plain text #: en/git-cvsserver.txt:421 #, priority:100 msgid "Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the attributes do not allow automatic detection for a filename, then the server uses the `gitcvs.allBinary` config for the default setting. If `gitcvs.allBinary` is set, then file not otherwise specified will default to '-kb' mode. Otherwise the `-k` mode is left blank. But if `gitcvs.allBinary` is set to \"guess\", then the correct `-k` mode will be guessed based on the contents of the file." -msgstr "" +msgstr "Alternativement, si la configuration `gitcvs.usecrlfattr` n'est pas activ챕e ou si les attributs ne permettent pas la d챕tection automatique pour un nom de fichier, alors le serveur utilise la configuration `gitcvs.allBinary` pour le param챔tre par d챕faut. Si `gitcvs.allBinary` est d챕fini, alors les fichiers qui ne sont pas sp챕cifi챕s autrement seront par d챕faut en mode '-kb'. Sinon, le mode `-k` est laiss챕 vide. Mais si `gitcvs.allBinary` est d챕fini 횪 \"guess\", alors le mode `-k` correct sera devin챕 en fonction du contenu du fichier." #. type: Plain text #: en/git-cvsserver.txt:425 #, priority:100 msgid "For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allBinary` to \"guess\"." -msgstr "" +msgstr "Pour une meilleure coh챕rence avec 'cvs', il est probablement pr챕f챕rable de remplacer les valeurs par d챕faut en mettant `gitcvs.usecrlfattr` 횪 true, et `gitcvs.allBinary` 횪 \"guess\"." #. type: Title - #: en/git-cvsserver.txt:427 #, no-wrap, priority:100 msgid "DEPENDENCIES" -msgstr "" +msgstr "D횋PENDANCES" #. type: Plain text #: en/git-cvsserver.txt:429 #, priority:100 msgid "'git-cvsserver' depends on DBD::SQLite." -msgstr "" +msgstr "'git-cvsserver' d챕pend de DBD::SQLite." #. type: Title = #: en/git-daemon.txt:2 @@ -19504,43 +19504,43 @@ msgid "" "\t [--user=<user> [--group=<group>]]]\n" "\t [--log-destination=(stderr|syslog|none)]\n" "\t [<directory>...]\n" -msgstr "" +msgstr "'git daemon' [--verbose] [--syslog] [--export-all]\n\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n\t [--strict-paths] [--base-path=<chemin>] [--base-path-relaxed]\n\t [--user-path | --user-path=<chemin>]\n\t [--interpolated-path=<chemin-de-mod챔le>]\n\t [--reuseaddr] [--detach] [--pid-file=<fichier>]\n\t [--enable=<service>] [--disable=<service>]\n\t [--allow-override=<service>] [--forbid-override=<service>]\n\t [--access-hook=<chemin>] [--[no-]informative-errors]\n\t [--inetd |\n\t [--listen=<h척te-ou-adr-ip>] [--port=<n>]\n\t [--user=<user> [--group=<groupe>]]]\n\t [--log-destination=(stderr|syslog|none)]\n\t [<r챕pertoire>...]\n" #. type: Plain text #: en/git-daemon.txt:31 #, priority:100 msgid "A really simple TCP Git daemon that normally listens on port \"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled." -msgstr "" +msgstr "Un d챕mon TCP Git tr챔s simple qui 챕coute normalement sur le port \"DEFAULT_GIT_PORT\" soit 9418. Il attend une connexion demandant un service, et servira ce service s'il est activ챕." #. type: Plain text #: en/git-daemon.txt:37 #, priority:100 msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `--export-all` parameter is specified). If you pass some directory paths as 'git daemon' arguments, you can further restrict the offers to a whitelist comprising of those." -msgstr "" +msgstr "Il v챕rifie que le r챕pertoire poss챔de le fichier magique \"git-daemon-export-ok\", et il refusera d'exporter tout r챕pertoire Git qui n'a pas 챕t챕 explicitement marqu챕 pour l'exportation de cette fa챌on (횪 moins que le param챔tre `--export-all` soit sp챕cifi챕). Si vous passez certains chemins de r챕pertoire en tant qu'arguments de 'git daemon', vous pouvez restreindre davantage les offres 횪 une liste blanche compos챕e de ceux-ci." #. type: Plain text #: en/git-daemon.txt:41 #, priority:100 msgid "By default, only `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', 'git pull', and 'git clone'." -msgstr "" +msgstr "Par d챕faut, seul le service `upload-pack` est activ챕, qui sert les clients 'git fetch-pack' et 'git ls-remote', qui sont invoqu챕s depuis 'git fetch', 'git pull', et 'git clone'." #. type: Plain text #: en/git-daemon.txt:44 #, priority:100 msgid "This is ideally suited for read-only updates, i.e., pulling from Git repositories." -msgstr "" +msgstr "Cette m챕thode convient parfaitement aux mises 횪 jour en lecture seule, c'est-횪-dire 횪 l'extraction de d챕p척ts Git." #. type: Plain text #: en/git-daemon.txt:46 #, priority:100 msgid "An `upload-archive` also exists to serve 'git archive'." -msgstr "" +msgstr "Une 'upload-archive' existe 챕galement pour servir 'git archive'." #. type: Plain text #: en/git-daemon.txt:54 #, priority:100 msgid "Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. 'git daemon' will refuse to start when this option is enabled and no whitelist is specified." -msgstr "" +msgstr "Faire correspondre exactement les chemins (c�셞st-횪-dire ne pas autoriser 짬혻/foo/d챕p척t혻쨩 lorsque le chemin r챕el est 짬혻/foo/d챕p척t.git혻쨩 ou 짬혻/foo/d챕p척t/.git혻쨩) et ne pas faire de chemins relatifs 횪 l�셵tilisateur. 'git daemon' refusera de d챕marrer lorsque cette option est activ챕e et qu�셙ucune liste blanche n�셞st sp챕cifi챕e." #. type: Labeled list #: en/git-daemon.txt:55 @@ -19552,7 +19552,7 @@ msgstr "--base-path=<chemin>" #: en/git-daemon.txt:61 #, priority:100 msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`." -msgstr "" +msgstr "Relocalise toutes les chemins de requ챗tes comme relatifs au chemin donn챕. C'est une sorte de \"racine Git\" - si vous ex챕cutez 'git daemon' avec '--base-path=/srv/git' sur exemple.com, alors si vous essayez plus tard de tirer 'git://exemple.com/hello.git', 'git daemon' interpr챕tera le chemin comme `/srv/git/hello.git`." #. type: Labeled list #: en/git-daemon.txt:62 @@ -19564,25 +19564,25 @@ msgstr "--base-path-relaxed" #: en/git-daemon.txt:67 #, priority:100 msgid "If --base-path is enabled and repo lookup fails, with this option 'git daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths." -msgstr "" +msgstr "Si --base-path est activ챕 et que la recherche de d챕p척t 챕choue, avec cette option 'git daemon' tentera de faire la recherche sans pr챕fixer le chemin de base. Ceci est utile pour passer 횪 l'utilisation de --base-path, tout en autorisant toujours les anciens chemins." #. type: Labeled list #: en/git-daemon.txt:68 #, no-wrap, priority:100 msgid "--interpolated-path=<pathtemplate>" -msgstr "" +msgstr "--interpolated-path=<mod챔le-de-chemin>" #. type: Plain text #: en/git-daemon.txt:77 #, priority:100 msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist." -msgstr "" +msgstr "Pour prendre en charge l'h챕bergement virtuel, un mod챔le de chemin interpol챕 peut 챗tre utilis챕 pour construire dynamiquement des chemins alternatifs. Le mod챔le prend en charge %H pour le nom d'h척te cible tel que fourni par le client mais converti en minuscules, %CH pour le nom d'h척te canonique, %IP pour l'adresse IP du serveur, %P pour le num챕ro de port et %D pour le chemin absolu du d챕p척t nomm챕. Apr챔s interpolation, le chemin est valid챕 par rapport 횪 la liste blanche des r챕pertoires." #. type: Plain text #: en/git-daemon.txt:82 #, priority:100 msgid "Allow pulling from all directories that look like Git repositories (have the 'objects' and 'refs' subdirectories), even if they do not have the 'git-daemon-export-ok' file." -msgstr "" +msgstr "Autoriser les tirages 횪 partir de tous les r챕pertoires qui ressemblent 횪 des d챕p척ts Git (avec les sous-r챕pertoires 'objects' et 'refs'), m챗me s'ils ne poss챔dent pas le fichier 'git-daemon-export-ok'." #. type: Labeled list #: en/git-daemon.txt:83 @@ -19594,67 +19594,67 @@ msgstr "--inetd" #: en/git-daemon.txt:88 #, priority:100 msgid "Have the server run as an inetd service. Implies --syslog (may be overridden with `--log-destination=`). Incompatible with --detach, --port, --listen, --user and --group options." -msgstr "" +msgstr "Faire tourner le serveur comme un service inetd. Implique --syslog (peut 챗tre surcharg챕 avec `--log-destination=`). Incompatible avec les options --detach, --port, --listen, --user et --group." #. type: Labeled list #: en/git-daemon.txt:89 #, no-wrap, priority:100 msgid "--listen=<host_or_ipaddr>" -msgstr "" +msgstr "--listen=<h척te_ou_adr_ip>" #. type: Plain text #: en/git-daemon.txt:96 #, priority:100 msgid "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option." -msgstr "" +msgstr "횋couter sur une adresse IP ou un nom d'h척te sp챕cifique. Les adresses IP peuvent 챗tre soit une adresse IPv4, soit une adresse IPv6 si elle est support챕e. Si IPv6 n'est pas support챕, alors --listen=<nom-d-hote> n'est pas support챕 non plus et --listen doit recevoir une adresse IPv4. Peut 챗tre donn챕 plus d'une fois. Incompatible avec l'option `--inetd`." #. type: Labeled list #: en/git-daemon.txt:97 #, no-wrap, priority:100 msgid "--port=<n>" -msgstr "" +msgstr "--port=<n>" #. type: Plain text #: en/git-daemon.txt:99 #, priority:100 msgid "Listen on an alternative port. Incompatible with `--inetd` option." -msgstr "" +msgstr "횋couter sur un port alternatif. Incompatible avec l'option `--inetd`." #. type: Labeled list #: en/git-daemon.txt:100 #, no-wrap, priority:100 msgid "--init-timeout=<n>" -msgstr "" +msgstr "--init-timeout=<n>" #. type: Plain text #: en/git-daemon.txt:104 #, priority:100 msgid "Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)." -msgstr "" +msgstr "D챕lai d'attente (en secondes) entre le moment o첫 la connexion est 챕tablie et celui o첫 la demande du client est re챌ue (g챕n챕ralement une valeur assez faible, puisque cela devrait 챗tre essentiellement imm챕diat)." #. type: Labeled list #: en/git-daemon.txt:105 en/git-upload-pack.txt:31 #, no-wrap, priority:100 msgid "--timeout=<n>" -msgstr "" +msgstr "--timeout=<n>" #. type: Plain text #: en/git-daemon.txt:109 #, priority:100 msgid "Timeout (in seconds) for specific client sub-requests. This includes the time it takes for the server to process the sub-request and the time spent waiting for the next client's request." -msgstr "" +msgstr "D챕lai d'attente (en secondes) pour les sous-requ챗tes sp챕cifiques du client. Cela comprend le temps n챕cessaire au serveur pour traiter la sous-demande et le temps d'attente de la demande du client suivant." #. type: Labeled list #: en/git-daemon.txt:110 #, no-wrap, priority:100 msgid "--max-connections=<n>" -msgstr "" +msgstr "--max-connections=<n>" #. type: Plain text #: en/git-daemon.txt:113 #, priority:100 msgid "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit." -msgstr "" +msgstr "Nombre maximum de clients simultan챕s, la valeur par d챕faut est de 32. D챕finissez-le 횪 z챕ro pour ne pas avoir de limite." #. type: Labeled list #: en/git-daemon.txt:114 @@ -19666,31 +19666,31 @@ msgstr "--syslog" #: en/git-daemon.txt:116 #, priority:100 msgid "Short for `--log-destination=syslog`." -msgstr "" +msgstr "Abr챕viation de `--log-destination=syslog`." #. type: Labeled list #: en/git-daemon.txt:117 #, no-wrap, priority:100 msgid "--log-destination=<destination>" -msgstr "" +msgstr "--log-destination=<destination>" #. type: Plain text #: en/git-daemon.txt:122 #, priority:100 msgid "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The <destination> must be one of:" -msgstr "" +msgstr "Envoyer les messages de journal 횪 la destination sp챕cifi챕e. Notez que cette option n'implique pas --verbose, donc par d챕faut, seules les conditions d'erreur seront enregistr챕es. La <destination> doit 챗tre l'une des suivantes :" #. type: Labeled list #: en/git-daemon.txt:124 #, no-wrap, priority:100 msgid "stderr" -msgstr "" +msgstr "stderr" #. type: Plain text #: en/git-daemon.txt:129 #, priority:100 msgid "Write to standard error. Note that if `--detach` is specified, the process disconnects from the real standard error, making this destination effectively equivalent to `none`." -msgstr "" +msgstr "횋criture sur le flux d'erreur standard. Notez que si `--detach` est sp챕cifi챕, le processus se d챕connecte de l'erreur standard r챕elle, rendant cette destination effectivement 챕quivalente 횪 `none`." #. type: Labeled list #: en/git-daemon.txt:129 @@ -19702,19 +19702,19 @@ msgstr "syslog" #: en/git-daemon.txt:131 #, priority:100 msgid "Write to syslog, using the `git-daemon` identifier." -msgstr "" +msgstr "횋crire dans syslog, en utilisant l'identifiant `git-daemon`." #. type: Plain text #: en/git-daemon.txt:133 #, priority:100 msgid "Disable all logging." -msgstr "" +msgstr "D챕sactiver toute la journalisation." #. type: Plain text #: en/git-daemon.txt:137 #, priority:100 msgid "The default destination is `syslog` if `--inetd` or `--detach` is specified, otherwise `stderr`." -msgstr "" +msgstr "La destination par d챕faut est `syslog` si `--inetd` ou `--detach` est sp챕cifi챕, sinon `stderr`." #. type: Labeled list #: en/git-daemon.txt:138 @@ -19732,13 +19732,13 @@ msgstr "--user-path=<chemin>" #: en/git-daemon.txt:147 #, priority:100 msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, requests to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is taken as a request to access `path/foo` repository in the home directory of user `alice`." -msgstr "" +msgstr "Autoriser l�셵tilisation de la notation {tilde}user dans les requ챗tes. Lorsqu�셞lles sont sp챕cifi챕es sans param챔tre, les demandes 횪 git://hote/{tilde}alice/foo sont consid챕r챕es comme une demande d�셙cc챔s au r챕f챕rentiel 'foo' dans le r챕pertoire de base de l�셵tilisateur `alice`. Si `--user-path=<chemin>` est sp챕cifi챕, la m챗me demande est prise comme une demande d�셙cc챔s au d챕p척t `<chemin>/foo' dans le r챕pertoire de base de l�셵tilisateur `alice`." #. type: Plain text #: en/git-daemon.txt:150 #, priority:100 msgid "Log details about the incoming connections and requested files." -msgstr "" +msgstr "Enregistre les d챕tails des connexions entrantes et des fichiers demand챕s." #. type: Labeled list #: en/git-daemon.txt:151 @@ -19750,13 +19750,13 @@ msgstr "--reuseaddr" #: en/git-daemon.txt:155 #, priority:100 msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out." -msgstr "" +msgstr "Utiliser SO_REUSEADDR pour lier la socket d'챕coute. Cela permet au serveur de red챕marrer sans attendre la fin des anciennes connexions." #. type: Plain text #: en/git-daemon.txt:158 #, priority:100 msgid "Detach from the shell. Implies --syslog." -msgstr "" +msgstr "Se d챕tacher du shell. Implique --syslog." #. type: Labeled list #: en/git-daemon.txt:159 @@ -19768,73 +19768,73 @@ msgstr "--pid-file=<fichier>" #: en/git-daemon.txt:162 #, priority:100 msgid "Save the process id in 'file'. Ignored when the daemon is run under `--inetd`." -msgstr "" +msgstr "Sauvegarder l'id du processus dans le 'fichier'. Ignor챕 lorsque le d챕mon est ex챕cut챕 sous `--inetd`." #. type: Labeled list #: en/git-daemon.txt:163 #, no-wrap, priority:100 msgid "--user=<user>" -msgstr "" +msgstr "--user=<utilisateur>" #. type: Labeled list #: en/git-daemon.txt:164 #, no-wrap, priority:100 msgid "--group=<group>" -msgstr "" +msgstr "--group=<groupe>" #. type: Plain text #: en/git-daemon.txt:170 #, priority:100 msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported." -msgstr "" +msgstr "Changer le uid et gid du daemon avant d'entrer la boucle du service. Le groupe ID primaire de l'utilisateur est utilis챕 quand seule l'option `--user` est donn챕e sans l'option `--group`. Les valeurs de l'option sont donn챕es par `getpwnam(3)` et `getgrnam(3)`, les valeurs num챕riques ne sont pas support챕es." #. type: Plain text #: en/git-daemon.txt:174 #, priority:100 msgid "Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning 'git daemon' if needed." -msgstr "" +msgstr "Donner ces options est une erreur lorsqu'elles sont utilis챕es avec `--inetd` ; utilisez la fonction du daemon inet pour r챕aliser la m챗me chose avant de lancer 'git daemon' si n챕cessaire." #. type: Plain text #: en/git-daemon.txt:181 #, priority:100 msgid "Like many programs that switch user id, the daemon does not reset environment variables such as `$HOME` when it runs git programs, e.g. `upload-pack` and `receive-pack`. When using this option, you may also want to set and export `HOME` to point at the home directory of `<user>` before starting the daemon, and make sure any Git configuration files in that directory are readable by `<user>`." -msgstr "" +msgstr "Comme beaucoup de programmes qui changent d'identit챕 d'utilisateur, le daemon ne r챕initialise pas les variables d'environnement telles que `$HOME` lorsqu'il ex챕cute les programmes git, par exemple `upload-pack` et `receive-pack`. Si vous utilisez cette option, vous voudrez peut-챗tre aussi d챕finir et exporter `HOME` pour qu'il pointe sur le r챕pertoire personnel de `<utilisateur>` avant de lancer le d챕mon, et vous assurer que tous les fichiers de configuration de Git dans ce r챕pertoire sont lisibles par `<utilisateur>`." #. type: Labeled list #: en/git-daemon.txt:182 #, no-wrap, priority:100 msgid "--enable=<service>" -msgstr "" +msgstr "--enable=<service>" #. type: Labeled list #: en/git-daemon.txt:183 #, no-wrap, priority:100 msgid "--disable=<service>" -msgstr "" +msgstr "--disable=<service>" #. type: Plain text #: en/git-daemon.txt:189 #, priority:100 msgid "Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item." -msgstr "" +msgstr "Activer/d챕sactiver le service 횪 l�쇒쯢helle du site par d챕faut. Notez qu�셵n service d챕sactiv챕 횪 l�쇒쯢helle du site peut toujours 챗tre activ챕 par d챕p척t s�셢l est marqu챕 comme substituable et que le d챕p척t active le service avec un 챕l챕ment de configuration." #. type: Labeled list #: en/git-daemon.txt:190 #, no-wrap, priority:100 msgid "--allow-override=<service>" -msgstr "" +msgstr "--allow-override=<service>" #. type: Labeled list #: en/git-daemon.txt:191 #, no-wrap, priority:100 msgid "--forbid-override=<service>" -msgstr "" +msgstr "--forbid-override=<service>" #. type: Plain text #: en/git-daemon.txt:195 #, priority:100 msgid "Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden." -msgstr "" +msgstr "Autoriser/interdire le remplacement de la valeur par d챕faut du site par une configuration par d챕p척t. Par d챕faut, tous les services peuvent 챗tre remplac챕s." #. type: Labeled list #: en/git-daemon.txt:196 @@ -19846,7 +19846,7 @@ msgstr "--[no-]informative-errors" #: en/git-daemon.txt:204 #, priority:100 msgid "When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like \"no such repository\" from \"repository not exported\". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report \"access denied\" to the client. The default is --no-informative-errors." -msgstr "" +msgstr "Lorsque les erreurs informatives sont activ챕es, git-daemon rapportera des erreurs plus d챕taill챕es au client, en diff챕renciant des conditions comme \"no such repository\" de \"repository not exported\". Ceci est plus pratique pour les clients, mais peut laisser fuir des informations sur l'existence de d챕p척ts non export챕s. Lorsque les erreurs informatives ne sont pas activ챕es, toutes les erreurs signalent \"acc챔s refus챕\" au client. La valeur par d챕faut est --no-informative-errors." #. type: Labeled list #: en/git-daemon.txt:205 @@ -19864,13 +19864,13 @@ msgstr "" #: en/git-daemon.txt:219 #, priority:100 msgid "The external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service." -msgstr "" +msgstr "Le command externe peut 챕crire optionalement une ligne en se sortie standard par 챗tre envoy챕 pour le requisiteur comme une m챕ssage d'error quand lui decline le service." #. type: Plain text #: en/git-daemon.txt:224 #, priority:100 msgid "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory." -msgstr "" +msgstr "Un r챕pertoire pour ajouter dans le liste blanche des r챕pertoire perm챕s. � moins que --strict-paths ne soit sp챕cifi챕 cette action inclura 챕galement les sous-r챕pertoire de chaque r챕pertoire nomm챕." #. type: Title - #: en/git-daemon.txt:226 en/git-http-backend.txt:35 @@ -19894,7 +19894,7 @@ msgstr "upload-pack" #: en/git-daemon.txt:240 #, priority:100 msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`." -msgstr "" +msgstr "Cela sert les clients 'git fetch-pack' et 'git ls-remote'. Il est activ챕 par d챕faut, mais un d챕p척t peut le d챕sactiver en definissant l'챕lement de configuration 'daemon.uploadpack' sur 'false'." #. type: Labeled list #: en/git-daemon.txt:241 @@ -19906,7 +19906,7 @@ msgstr "upload-archive" #: en/git-daemon.txt:245 #, priority:100 msgid "This serves 'git archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`." -msgstr "" +msgstr "Cela sert 'git archive --remote'. Il est d챕sactiv챕 par d챕faut, mais un d챕p척t peut l'activer en definissant l'element de configuration 'daemon.uploadarch' sur 'true'." #. type: Labeled list #: en/git-daemon.txt:246 @@ -68700,7 +68700,7 @@ msgstr "" #: en/git-bisect-lk2009.txt:1358 #, priority:100 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" -msgstr "" +msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "Store the files instead of deflating them." #~ msgstr "Stocker les fichiers au lieu de les compresser." diff --git a/po/documentation.ja.po b/po/documentation.ja.po index 359e6aad90cac87523e7a4c868be02a6320b750f..6379f2546801f14ed24050c706492a5f24370eb0 100644 --- a/po/documentation.ja.po +++ b/po/documentation.ja.po @@ -4,7 +4,7 @@ # Jean-No챘l AVILA <jn.avila@free.fr>, 2020. # msgid "" -msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2021-11-15 16:49+0000\nLast-Translator: yajamon <yajamon.tatsuki@gmail.com>\nLanguage-Team: Japanese\nLanguage: ja\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.9.1-dev\n" +msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2021-11-25 13:53+0000\nLast-Translator: yajamon <yajamon.tatsuki@gmail.com>\nLanguage-Team: Japanese\nLanguage: ja\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.10-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31 @@ -3059,7 +3059,7 @@ msgstr "DATE FORMATS" #: en/date-formats.txt:6 #, priority:280 msgid "The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables support the following date formats:" -msgstr "�겼쥊鸚됪빊`GIT_AUTHOR_DATE`��`GIT_COMMITTER_DATE`��빳訝뗣겗�δ퍡�뺛궔�쇈깯�껁깉�믡궢�앫꺖�덀걮�╉걚�얇걲��" +msgstr "�겼쥊鸚됪빊 `GIT_AUTHOR_DATE` �� `GIT_COMMITTER_DATE` ��빳訝뗣겗�δ퍡�뺛궔�쇈깯�껁깉�믡궢�앫꺖�덀걮�╉걚�얇걲��" #. type: Labeled list #: en/date-formats.txt:7 @@ -3071,7 +3071,7 @@ msgstr "Git��냵�ⓦ깢�⒲꺖�욁긿��" #: en/date-formats.txt:12 #, priority:280 msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch. `<time zone offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`." -msgstr "�볝굦��`<unix timestamp> <time zone offset>`�㎯��`<unix timestamp>`�칄NIX�ⓦ깮�껁궚�뗣굢��쭜�겹겎�쇻�� `<time zone offset>`���갪TC�뗣굢���縕졼겗�ゃ깢�삠긿�덀겎�쇻�� 堊뗣걟�겹�갅ET竊늈TC�덀굤1�귡뼋�꿔굯�㎯걚�뗰펹��`+0100`�㎯걲��" +msgstr "�볝굦�� `<unix timestamp> <time zone offset>` �㎯��`<unix timestamp>` �칄NIX�ⓦ깮�껁궚�뗣굢��쭜�겹겎�쇻�� `<time zone offset>` ���갪TC�뗣굢���縕졼겗�ゃ깢�삠긿�덀겎�쇻�� 堊뗣걟�겹�갅ET竊늈TC�덀굤1�귡뼋�꿔굯�㎯걚�뗰펹�� `+0100` �㎯걲��" #. type: Labeled list #: en/date-formats.txt:13 @@ -3083,7 +3083,7 @@ msgstr "RFC 2822" #: en/date-formats.txt:16 #, priority:280 msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`." -msgstr "RFC2822�ヨ쮼雍됥걬�뚣겍�꾠굥與숁틬�꾠겒�삣춴�▲꺖�ャ겗�뺛궔�쇈깯�껁깉�㎯�곦풃�덀겙`Thu, 07 Apr 2005 22:13:13 +0200`��굠�녴겓�ゃ굤�얇걲��" +msgstr "RFC2822�ヨ쮼雍됥걬�뚣겍�꾠굥與숁틬�꾠겒�삣춴�▲꺖�ャ겗�뺛궔�쇈깯�껁깉�㎯�곦풃�덀겙 `Thu, 07 Apr 2005 22:13:13 +0200` ��굠�녴겓�ゃ굤�얇걲��" #. type: Labeled list #: en/date-formats.txt:17 @@ -3095,19 +3095,19 @@ msgstr "ISO 8601" #: en/date-formats.txt:23 #, priority:280 msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`." -msgstr "ISO 8601誤뤸졏�㎪뙁若싥걬�뚣걼�귛댗�ⓩ뿥餓섅겎�곦풃�덀겙`2005-04-07T22:13:13`��굠�녴겓�ゃ굤�얇걲�귙깙�쇈궢�쇈겘��`T`�뉐춻��빰�뤵굤�ャ궧�싥꺖�밤굚�쀣걨�γ굦�얇걲�귞쭜��ク�겹겘�↑쫿�뺛굦�얇걲�귚풃�덀겙��`2005-04-07T22:13:13.019` �� `2005-04-07T22:13:13` �ⓦ걮��돮�뤵굦�얇걲��" +msgstr "ISO 8601誤뤸졏�㎪뙁若싥걬�뚣걼�귛댗�ⓩ뿥餓섅겎�곦풃�덀겙 `2005-04-07T22:13:13` ��굠�녴겓�ゃ굤�얇걲�귙깙�쇈궢�쇈겘��`T` �뉐춻��빰�뤵굤�ャ궧�싥꺖�밤굚�쀣걨�γ굦�얇걲�귞쭜��ク�겹겘�↑쫿�뺛굦�얇걲�귚풃�덀겙��`2005-04-07T22:13:13.019` �� `2005-04-07T22:13:13` �ⓦ걮��돮�뤵굦�얇걲��" #. type: Plain text #: en/date-formats.txt:26 #, priority:280 msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`." -msgstr "�얇걼�곫뿥餓섌깿�녴겘餓δ툔��깢�⒲꺖�욁긿�덀겎�쀣걨餓섅걨�얇걲�괲YYYY.MM.DD`��`MM/DD/YYYY`��`DD.MM.YYYY`�㎯걲��" +msgstr "�얇걼�곫뿥餓섌깿�녴겘餓δ툔��깢�⒲꺖�욁긿�덀겎�쀣걨餓섅걨�얇걲�� `YYYYY.MM.DD`��`MM/DD/YYYY`��`DD.MM.YYYY` �㎯걲��" #. type: Plain text #: en/date-formats.txt:31 #, priority:280 msgid "In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like \"yesterday\" or \"last Friday at noon\"." -msgstr "訝딂쮼��걲�밤겍��뿥餓섅깢�⒲꺖�욁긿�덀굮沃띹춼�쇻굥�볝겏�ュ뒥�덀겍��`--date`�ゃ깤�룔깾�녈겘��\"yesterday\" �� \"last Friday at noon\" �ⓦ걚�c걼�멨��꾠겒�δ퍡�ゃ겑�곥굠�듾볶�볞릎恙껁겗�δ퍡�뺛궔�쇈깯�껁깉�믥릤鰲c걮�덀걝�ⓦ걮�얇걲��" +msgstr "訝딂쮼��걲�밤겍��뿥餓섅깢�⒲꺖�욁긿�덀굮沃띹춼�쇻굥�볝겏�ュ뒥�덀겍��`--date` �ゃ깤�룔깾�녈겘��\"yesterday\" �� \"last Friday at noon\" �ⓦ걚�c걼�멨��꾠겒�δ퍡�ゃ겑�곥굠�듾볶�볞릎恙껁겗�δ퍡�뺛궔�쇈깯�껁깉�믥릤鰲c걮�덀걝�ⓦ걮�얇걲��" #. type: Title - #: en/diff-format.txt:2 @@ -3251,7 +3251,7 @@ msgstr "�밤깇�쇈궭�밤�곩풄�띲겓�ゃ깤�룔깾�녈겎�뚣궧�녈궋�띲겗�겼춻�� #: en/diff-format.txt:50 #, priority:280 msgid "a tab or a NUL when `-z` option is used." -msgstr "�욍깣��`-z`�ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�╉걚�뗥졃�덀겘NUL��" +msgstr "�욍깣��`-z` �ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�╉걚�뗥졃�덀겘NUL��" #. type: Plain text #: en/diff-format.txt:51 @@ -3263,7 +3263,7 @@ msgstr "\"src\"��깙��" #: en/diff-format.txt:52 #, priority:280 msgid "a tab or a NUL when `-z` option is used; only exists for C or R." -msgstr "�욍깣��`-z`�ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�╉걚�뗥졃�덀겘NUL�� C�얇걼�칁��졃�덀겓��겳耶섇쑉�쀣겲�쇻��" +msgstr "�욍깣��`-z` �ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�╉걚�뗥졃�덀겘NUL�� C�얇걼�칁��졃�덀겓��겳耶섇쑉�쀣겲�쇻��" #. type: Plain text #: en/diff-format.txt:53 @@ -3275,7 +3275,7 @@ msgstr "\"dst\"��깙�밤�� C�얇걼�칁��졃�덀겓��겳耶섇쑉�쀣겲�쇻��" #: en/diff-format.txt:54 #, priority:280 msgid "an LF or a NUL when `-z` option is used, to terminate the record." -msgstr "LF��`-z`�ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�╉걚�뗥졃�덀겘NUL�㎯�곥꺃�녈꺖�됥굮永귚틙�쀣겲�쇻��" +msgstr "LF��`-z` �ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�╉걚�뗥졃�덀겘NUL�㎯�곥꺃�녈꺖�됥굮永귚틙�쀣겲�쇻��" #. type: Plain text #: en/diff-format.txt:56 @@ -3407,7 +3407,7 @@ msgstr "�욍깣�㎩뙷�뉎굢�뚣걼�뺛궊�ㅳ꺂��깙�밧릫(筽뉑빊��)" #: en/diff-format.txt:104 #, priority:280 msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit." -msgstr "`-c` �� `--cc` �㎯겘�곥깢�▲궎�ャ겗�띶뎺�뚣깚�밤깉�ゃ겗�꾠걳�뚣걢��겢�㎩쨯�담걬�뚣걼�닷릦�㎯굚�곩츥�덀겲�잆겘��永귙깙�밤겗�욍걣烏①ㅊ�뺛굦�얇걲�� `--combined-all-paths`�㎯겘�곥걹�뚣걻�뚣겗誤ゃ겗�묆궧��릫�띲겗孃뚣겓�곥깯�쇈궦�녈깱�껁깉��깙�밤겗�띶뎺�뚩〃鹽뷩걬�뚣겲�쇻��" +msgstr "`-c` �� `--cc` �㎯겘�곥깢�▲궎�ャ겗�띶뎺�뚣깚�밤깉�ゃ겗�꾠걳�뚣걢��겢�㎩쨯�담걬�뚣걼�닷릦�㎯굚�곩츥�덀겲�잆겘��永귙깙�밤겗�욍걣烏①ㅊ�뺛굦�얇걲�� `--combined-all-paths` �㎯겘�곥걹�뚣걻�뚣겗誤ゃ겗�묆궧��릫�띲겗孃뚣겓�곥깯�쇈궦�녈깱�껁깉��깙�밤겗�띶뎺�뚩〃鹽뷩걬�뚣겲�쇻��" #. type: Plain text #: en/diff-format.txt:106 @@ -3455,7 +3455,7 @@ msgstr "�앫겗餓뽧겗diff�뺛궔�쇈깯�껁깉" #: en/diff-format.txt:134 #, priority:280 msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption." -msgstr "`--summary`�ゃ깤�룔깾�녈겎���곫뼭�쀣걦瓦썲뒥�뺛굦�잆깢�▲궎�ャ�곩뎷�ㅳ걬�뚣걼�뺛궊�ㅳ꺂�곩릫�띲걣鸚됪쎍�뺛굦�잆깢�▲궎�ャ�곥궠�붵꺖�뺛굦�잆깢�▲궎�ャ겓�ㅳ걚��が�롢걮�얇걲�� `--stat`�ゃ깤�룔깾�녈겘�갺iffstat(1)��궛�⒲깢�믣눣�쎼겓瓦썲뒥�쀣겲�쇻�� �볝굦�됥겗�ゃ깤�룔깾�녈겘��`-p`�ゃ겑��퍟��궕�쀣궥�㎯꺍�①탡�욕릦�뤵걵�뗣걪�ⓦ걣�㎯걤�곦볶�볝걣易덅꼇�쇻굥�볝겏�믥쎅�꾠겏�쀣겍�꾠겲�쇻��" +msgstr "`--summary` �ゃ깤�룔깾�녈겎���곫뼭�쀣걦瓦썲뒥�뺛굦�잆깢�▲궎�ャ�곩뎷�ㅳ걬�뚣걼�뺛궊�ㅳ꺂�곩릫�띲걣鸚됪쎍�뺛굦�잆깢�▲궎�ャ�곥궠�붵꺖�뺛굦�잆깢�▲궎�ャ겓�ㅳ걚��が�롢걮�얇걲�� `--stat` �ゃ깤�룔깾�녈겘�갺iffstat(1)��궛�⒲깢�믣눣�쎼겓瓦썲뒥�쀣겲�쇻�� �볝굦�됥겗�ゃ깤�룔깾�녈겘��`-p` �ゃ겑��퍟��궕�쀣궥�㎯꺍�①탡�욕릦�뤵걵�뗣걪�ⓦ걣�㎯걤�곦볶�볝걣易덅꼇�쇻굥�볝겏�믥쎅�꾠겏�쀣겍�꾠겲�쇻��" #. type: Plain text #: en/diff-format.txt:139 @@ -3473,7 +3473,7 @@ msgstr "arch/{i386 => x86}/Makefile | 4 +--\n" #: en/diff-format.txt:147 #, priority:280 msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:" -msgstr "`--numstat`�ゃ깤�룔깾�녈겘�갺iffstat(1)��깄�긱굮�먧풘�쀣겲�쇻걣�곥깯�룔꺍�㎯겗易덅꼇�뚦��볝겓�ゃ굥�덀걝�ヨÞ鼇덀걬�뚣겍�꾠겲�쇻�� `--numstat`��눣�쎼겗�ⓦ꺍�덀꺁��А��굠�녴겓�ゃ굤�얇걲��" +msgstr "`--numstat` �ゃ깤�룔깾�녈겘�갺iffstat(1)��깄�긱굮�먧풘�쀣겲�쇻걣�곥깯�룔꺍�㎯겗易덅꼇�뚦��볝겓�ゃ굥�덀걝�ヨÞ鼇덀걬�뚣겍�꾠겲�쇻�� `--numstat` ��눣�쎼겗�ⓦ꺍�덀꺁��А��굠�녴겓�ゃ굤�얇걲��" #. type: delimited block - #: en/diff-format.txt:151 @@ -3567,7 +3567,7 @@ msgstr "NUL��" #: en/diff-format.txt:185 #, priority:280 msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths." -msgstr "�띶뎺�믣쨯�담걮�잌졃�덀겗�쀣꺁�ㅳ깳�쇈궦�묆궧��뎺�ヤ퐰�녴겒 `NUL` �뚣걗�뗣겗���곩눣�쎼굮沃���밤궚�ゃ깤�덀걣�곭뤎�②き�얇굦�╉걚�뗣꺃�녈꺖�됥걣�룔꺍�겹꺂�묆궧��꺃�녈꺖�됥겒��걢�곥꺁�띲꺖��/�녈깞�쇈겗�с궠�쇈깋�ゃ겗�뗣굮�곩뀍�믦き�얇걳�ュ닩�γ겎�띲굥�덀걝�ャ걲�뗣걼�곥겎�쇻�� 瓦썲뒥�뺛굦�잒죱�꾢뎷�ㅳ걬�뚣걼烏뚣굮沃�굯�졾풄��`NUL`�얇겎沃�굙�겹깙�밧릫�뚣굩�뗣굤�얇걲�뚣�곥걹�뚣걣`NUL`�㎯걗�뚣겙�곥꺃�녈꺖�됥겘2�ㅳ겗�묆궧�믥ㅊ�쀣겲�쇻��" +msgstr "�띶뎺�믣쨯�담걮�잌졃�덀겗�쀣꺁�ㅳ깳�쇈궦�묆궧��뎺�ヤ퐰�녴겒 `NUL` �뚣걗�뗣겗���곩눣�쎼굮沃���밤궚�ゃ깤�덀걣�곭뤎�②き�얇굦�╉걚�뗣꺃�녈꺖�됥걣�룔꺍�겹꺂�묆궧��꺃�녈꺖�됥겒��걢�곥꺁�띲꺖��/�녈깞�쇈겗�с궠�쇈깋�ゃ겗�뗣굮�곩뀍�믦き�얇걳�ュ닩�γ겎�띲굥�덀걝�ャ걲�뗣걼�곥겎�쇻�� 瓦썲뒥�뺛굦�잒죱�꾢뎷�ㅳ걬�뚣걼烏뚣굮沃�굯�졾풄��`NUL` �얇겎沃�굙�겹깙�밧릫�뚣굩�뗣굤�얇걲�뚣�곥걹�뚣걣 `NUL` �㎯걗�뚣겙�곥꺃�녈꺖�됥겘2�ㅳ겗�묆궧�믥ㅊ�쀣겲�쇻��" #. type: Title - #: en/diff-generate-patch.txt:2 @@ -3603,13 +3603,13 @@ msgstr "diff --git a/file1 b/file2\n" #: en/diff-generate-patch.txt:26 #, priority:280 msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames." -msgstr "`a/` �� `b/` ��깢�▲궎�ュ릫���곥꺁�띲꺖�졼굜�녈깞�쇈걣永▲겲�ゃ걚�먦굤�곩릪�섅굚��겓�ゃ굤�얇걲�� �밤겓�곦퐳�먦굜�딃솮��졃�덀겎�귙��`/dev/null`��`a/`��`b/`��깢�▲궎�ュ릫��빰�뤵굤�ヤ슴�뤵굦�뗣걪�ⓦ겘 _�귙굤�얇걵��_ ��" +msgstr "`a/` �� `b/` ��깢�▲궎�ュ릫���곥꺁�띲꺖�졼굜�녈깞�쇈걣永▲겲�ゃ걚�먦굤�곩릪�섅굚��겓�ゃ굤�얇걲�� �밤겓�곦퐳�먦굜�딃솮��졃�덀겎�귙��`/dev/null` �� `a/` �� `b/` ��깢�▲궎�ュ릫��빰�뤵굤�ヤ슴�뤵굦�뗣걪�ⓦ겘 _�귙굤�얇걵��_ ��" #. type: Plain text #: en/diff-generate-patch.txt:30 #, priority:280 msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively." -msgstr "�ゃ깓�쇈깲/�녈깞�쇈걣烏뚣굩�뚣걼�닷릦��`file1`��`file2`��걹�뚣걻�뚣꺁�띲꺖��/�녈깞�쇈겗�껁겏�ゃ굥�뺛궊�ㅳ꺂��릫�띲겏�곥꺁�띲꺖��/�녈깞�쇈걣�잍닇�쇻굥�뺛궊�ㅳ꺂��릫�띲굮鹽뷩걮�╉걚�얇걲��" +msgstr "�ゃ깓�쇈깲/�녈깞�쇈걣烏뚣굩�뚣걼�닷릦��`file1` �� `file2` ��걹�뚣걻�뚣꺁�띲꺖��/�녈깞�쇈겗�껁겏�ゃ굥�뺛궊�ㅳ꺂��릫�띲겏�곥꺁�띲꺖��/�녈깞�쇈걣�잍닇�쇻굥�뺛궊�ㅳ꺂��릫�띲굮鹽뷩걮�╉걚�얇걲��" #. type: Plain text #: en/diff-generate-patch.txt:32 @@ -3644,7 +3644,7 @@ msgstr "�뺛궊�ㅳ꺂�㏂꺖�됥겘�곥깢�▲궎�ャ궭�ㅳ깤�ⓦ깢�▲궎�ャ깙�쇈깱 #: en/diff-generate-patch.txt:49 #, priority:280 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes." -msgstr "�▼섧�섅긿���쇈겗�묆궧�띲겓���� `a/`�듽굠�� `b/`�쀣꺃�뺛궍�껁궚�밤겘�ャ겲�뚣겲�쎼굯��" +msgstr "�▼섧�섅긿���쇈겗�묆궧�띲겓���� `a/` �듽굠�� `b/` �쀣꺃�뺛궍�껁궚�밤겘�ャ겲�뚣겲�쎼굯��" #. type: Plain text #: en/diff-generate-patch.txt:56 @@ -3686,7 +3686,7 @@ msgstr "diff --git a/a b/b\nrename from a\nrename to b\ndiff --git a/b b/a\nrena #: en/diff-generate-patch.txt:81 #, priority:280 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor to this to specific languages." -msgstr "�뤵꺍��깦�껁����곥걹��깗�녈궚�뚪겑�ⓦ걬�뚣굥�€빊��릫�띲굮鼇��듽걮�얇걲�� �볝굦�믥돶若싥겗鼇�沃욁겓�덀굩�쎼겍沃욘빐�쇻굥�방퀡��㈂榮겹겘 linkgit:gitattributes[5] �� \"Defining a custom hunk-header\" �믣뢿�㎯걦�졼걬�꾠��" +msgstr "�뤵꺍��깦�껁����곥걹��깗�녈궚�뚪겑�ⓦ걬�뚣굥�€빊��릫�띲굮鼇��듽걮�얇걲�� �볝굦�믥돶若싥겗鼇�沃욁겓�덀굩�쎼겍沃욘빐�쇻굥�방퀡��㈂榮겹겘 linkgit:gitattributes[5] �� \"Defining a custom hunk-header\" �믣뢿�㎯걮�╉걦�졼걬�꾠��" #. type: Title - #: en/diff-generate-patch.txt:84 @@ -3753,7 +3753,7 @@ msgstr " +\tif (get_sha1(arg, sha1) < 0)\n +\t\tusage(describe_usage);\n +\tcmit #: en/diff-generate-patch.txt:127 #, priority:280 msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):" -msgstr "�볝굦��뎺�ャ겘 \"git diff\" �ⓦ걚�녴깦�껁��쇈걣餓섅걨�됥굦�곫А��굠�녴겓�ゃ굤�얇걲竊�`-c`�ゃ깤�룔깾�녈굮鵝욜뵪�쀣걼�닷릦竊됥��" +msgstr "�볝굦��뎺�ャ겘 \"git diff\" �ⓦ걚�녴깦�껁��쇈걣餓섅걨�됥굦�곫А��굠�녴겓�ゃ굤�얇걲竊�`-c` �ゃ깤�룔깾�녈굮鵝욜뵪�쀣걼�닷릦竊됥��" #. type: Plain text #: en/diff-generate-patch.txt:129 @@ -3765,7 +3765,7 @@ msgstr "diff --combined file\n" #: en/diff-generate-patch.txt:131 #, priority:280 msgid "or like this (when the `--cc` option is used):" -msgstr "�얇걼��А��굠�녴겓�ゃ굤�얇걲竊�`--cc`�ゃ깤�룔깾�녈굮鵝욜뵪�쀣걼�닷릦竊됥��" +msgstr "�얇걼��А��굠�녴겓�ゃ굤�얇걲竊�`--cc` �ゃ깤�룔깾�녈굮鵝욜뵪�쀣걼�닷릦竊됥��" #. type: Plain text #: en/diff-generate-patch.txt:133 @@ -3817,7 +3817,7 @@ msgstr "b/file" #: en/diff-generate-patch.txt:156 #, priority:280 msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files." -msgstr "孃볠씎�� 'unified' diff�뺛궔�쇈깯�껁깉��2烏뚣깦�껁��쇈겏�뚧쭣�ャ��`/dev/null`��깢�▲궎�ャ겗鵝쒏닇�꾢뎷�ㅳ굮�γ굢�쎼굥�잆굙�ヤ슴�뤵굦�얇걲��" +msgstr "孃볠씎�� 'unified' diff�뺛궔�쇈깯�껁깉��2烏뚣깦�껁��쇈겏�뚧쭣�ャ��`/dev/null` ��깢�▲궎�ャ겗鵝쒏닇�꾢뎷�ㅳ굮�γ굢�쎼굥�잆굙�ヤ슴�뤵굦�얇걲��" #. type: Plain text #: en/diff-generate-patch.txt:160 @@ -3847,7 +3847,7 @@ msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n" #: en/diff-generate-patch.txt:180 #, priority:280 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format." -msgstr "永먨릦�뺛굦�웓iff壤℡폀��긽�c꺍��깦�껁��쇈겓��펷誤ゃ겗��+ 1��펹 `@`�뉐춻�뚣걗�듽겲�쇻��" +msgstr "永먨릦�뺛굦�웓iff壤℡폀��긽�c꺍��깦�껁��쇈겓��펷誤ゃ겗��+ 1��펹 `@` �뉐춻�뚣걗�듽겲�쇻��" #. type: Plain text #: en/diff-generate-patch.txt:189 @@ -3859,7 +3859,7 @@ msgstr "孃볠씎��'unified' diff壤℡폀�ⓦ겘�겹겒�듽��2�ㅳ겗�뺛궊�ㅳ꺂A�쭮 #: en/diff-generate-patch.txt:195 #, priority:280 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)." -msgstr "N�쀣겗`-`�뉐춻���곥걹��죱�똣ileN�ョ뤎�뚣겍�꾠굥�뚣�곭탳�쒌겓��뤎�뚣겍�꾠겒�꾠걪�ⓦ굮�뤷뫑�쀣겲�쇻�� N�쀣겗`+`�뉐춻���곥걹��죱�뚨탳�쒌겓�얇굦�갽ileN�ャ겘�앫겗烏뚣걣�ゃ걚�볝겏�믤꼷�녈걮�얇걲竊덀겇�얇굤�곥걹��┴�뗣굢誤뗣굦�겹�곥걹��죱��옙�졼걬�뚣걼�볝겏�ャ겒�듽겲�숋펹��" +msgstr "N�쀣겗 `-` �뉐춻���곥걹��죱�똣ileN�ョ뤎�뚣겍�꾠굥�뚣�곭탳�쒌겓��뤎�뚣겍�꾠겒�꾠걪�ⓦ굮�뤷뫑�쀣겲�쇻�� N�쀣겗 `+` �뉐춻���곥걹��죱�뚨탳�쒌겓�얇굦�갽ileN�ャ겘�앫겗烏뚣걣�ゃ걚�볝겏�믤꼷�녈걮�얇걲竊덀겇�얇굤�곥걹��┴�뗣굢誤뗣굦�겹�곥걹��죱��옙�졼걬�뚣걼�볝겏�ャ겒�듽겲�숋펹��" #. type: Plain text #: en/diff-generate-patch.txt:201 @@ -3871,7 +3871,7 @@ msgstr "訝딂쮼��눣�쎽풃�㎯겘�곲뼟�겹겗�룔궛�띲긽�c걣訝→뼶��깢�▲궎 #: en/diff-generate-patch.txt:207 #, priority:280 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")." -msgstr "`git diff-tree -c` �㎬〃鹽뷩걲�뗣겏�곥깯�쇈궦�녈깱�껁깉��┴�ⓦ깯�쇈궦永먩옖�믤캈雍껁걮�얇걲 (�ㅳ겲�듽�� file1..fileN �뚩┴)�� `git diff-files -c`�㎬〃鹽뷩걬�뚣굥�닷릦����2�ㅳ겗�よ㎗黎뷩겗�욁꺖�멱┴�ⓧ퐳璵�깂�ゃ꺖�뺛궊�ㅳ꺂�믤캈雍껁걮�얇걲(�ㅳ겲�듽�갽ile1 ��궧�녴꺖��2�곩닪�� \"燁곥걼�▲겗�먦꺖�멥깾��\" �갽ile2 ��궧�녴꺖��3�곩닪�� \"壤쇈굢��깘�쇈궦�㎯꺍\" )��" +msgstr "`git diff-tree -c` �㎬〃鹽뷩걲�뗣겏�곥깯�쇈궦�녈깱�껁깉��┴�ⓦ깯�쇈궦永먩옖�믤캈雍껁걮�얇걲 (�ㅳ겲�듽�� file1..fileN �뚩┴)�� `git diff-files -c` �㎬〃鹽뷩걬�뚣굥�닷릦����2�ㅳ겗�よ㎗黎뷩겗�욁꺖�멱┴�ⓧ퐳璵�깂�ゃ꺖�뺛궊�ㅳ꺂�믤캈雍껁걮�얇걲(�ㅳ겲�듽�갽ile1 ��궧�녴꺖��2�곩닪�� \"燁곥걼�▲겗�먦꺖�멥깾��\" �갽ile2 ��궧�녴꺖��3�곩닪�� \"壤쇈굢��깘�쇈궦�㎯꺍\" )��" #. type: Labeled list #: en/diff-options.txt:17 en/git-rebase.txt:405 en/merge-options.txt:109 @@ -3979,7 +3979,7 @@ msgstr "-m" #: en/diff-options.txt:56 #, priority:280 msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`." -msgstr "�볝겗�ゃ깤�룔깾�녈겘�곥깯�쇈궦�녈깱�껁깉�� diff �뷴뒟�믡깈�뺛궔�ャ깉��깢�⒲꺖�욁긿�덀겎烏①ㅊ�쀣겲�쇻��`-m` �� `-p` �뚧뙁若싥걬�뚣걼�닷릦�ャ겗�욕눣�쎼걬�뚣겲�쇻�귙깈�뺛궔�ャ깉��깢�⒲꺖�욁긿�덀겘�곥궠�녈깢�c궙�γ꺃�쇈궥�㎯꺍�묆꺀�▲꺖�욍겗 `log.diffMerges` �㎩쨯�담걲�뗣걪�ⓦ걣�㎯걤�얇걲�귙걪��깙�⒲깳�쇈궭��깈�뺛궔�ャ깉�ㅳ겘 `separate` �㎯걲��" +msgstr "�볝겗�ゃ깤�룔깾�녈겘�곥깯�쇈궦�녈깱�껁깉�� diff �뷴뒟�믡깈�뺛궔�ャ깉��깢�⒲꺖�욁긿�덀겎烏①ㅊ�쀣겲�쇻�� `-m` �� `-p` �뚧뙁若싥걬�뚣걼�닷릦�ャ겗�욕눣�쎼걬�뚣겲�쇻�귙깈�뺛궔�ャ깉��깢�⒲꺖�욁긿�덀겘�곥궠�녈깢�c궙�γ꺃�쇈궥�㎯꺍�묆꺀�▲꺖�욍겗 `log.diffMerges` �㎩쨯�담걲�뗣걪�ⓦ걣�㎯걤�얇걲�귙걪��깙�⒲깳�쇈궭��깈�뺛궔�ャ깉�ㅳ겘 `separate` �㎯걲��" #. type: Labeled list #: en/diff-options.txt:57 @@ -4033,7 +4033,7 @@ msgstr "-c" #: en/diff-options.txt:76 #, priority:280 msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`." -msgstr "�볝겗�ゃ깤�룔깾�녈굮鵝욜뵪�쇻굥�ⓦ�곥깯�쇈궦�녈깱�껁깉�췥iff�뷴뒟���곮┴�①탳�쒌겗�싥궋�붵겏��량�녴굮訝�佯╉겓1�ㅳ걳�ㅸ〃鹽뷩걲�뗣겗�㎯겘�ゃ걦�곩릢誤ゃ걢�됥겗藥�늽�믡깯�쇈궦永먩옖�ュ릪�귙겓烏①ㅊ�쀣겲�쇻�귙걬�됥겓�곥걲�밤겍��┴�뗣굢鸚됪쎍�뺛굦�잆깢�▲궎�ャ겗�욍걣訝�誤㎬〃鹽뷩걬�뚣겲�쇻�� `-c`��`-p`�믤꼷�녈걮�얇걲��" +msgstr "�볝겗�ゃ깤�룔깾�녈굮鵝욜뵪�쇻굥�ⓦ�곥깯�쇈궦�녈깱�껁깉�췥iff�뷴뒟���곮┴�①탳�쒌겗�싥궋�붵겏��량�녴굮訝�佯╉겓1�ㅳ걳�ㅸ〃鹽뷩걲�뗣겗�㎯겘�ゃ걦�곩릢誤ゃ걢�됥겗藥�늽�믡깯�쇈궦永먩옖�ュ릪�귙겓烏①ㅊ�쀣겲�쇻�귙걬�됥겓�곥걲�밤겍��┴�뗣굢鸚됪쎍�뺛굦�잆깢�▲궎�ャ겗�욍걣訝�誤㎬〃鹽뷩걬�뚣겲�쇻�� `-c` �� `-p` �믤꼷�녈걮�얇걲��" #. type: Labeled list #: en/diff-options.txt:77 @@ -6287,31 +6287,31 @@ msgstr "�볝겗�녈깯�녈깋���곦퐳璵�깂�ゃ꺖�㎬쫳�ㅳ걢�c걼�얍쑉��궠�� #: en/git-add.txt:31 #, priority:300 msgid "The \"index\" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit. Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index." -msgstr "�볝겗�ㅳ꺍�뉎긿��궧�㏛퐳璵�깂�ゃ꺖��궠�녈깇�녈깂��궧�듽긿�쀣궥�㎯긿�덀굮岳앮똻�쀣�곫А��궠�잆긿�덆슋�ュ룚孃쀣걬�뚣굥�녈꺍�녴꺍�꾠겘�볝겗�밤깏�껁깤�룔깾�껁깉�㎯걲�귙걮�잆걣�c겍�곩컩�쀣겎�귚퐳璵�깂�ゃ꺖�ュ쨯�담굮�졼걟�잌풄�칌ommit�녈깯�녈깋�믣츪烏뚣걲�뗥뎺�ャ�� `add`�녈깯�녈깋�믢슴�ⓦ걮�곫뼭�쀣걚�뺛궊�ㅳ꺂�얇걼��쨯�담걬�뚣걼�뺛궊�ㅳ꺂�믡궎�녈깈�껁궚�밤겓瓦썲뒥�쇻굥恙낁쫨�뚣걗�듽겲�쇻��" +msgstr "�볝겗�ㅳ꺍�뉎긿��궧�㏛퐳璵�깂�ゃ꺖��궠�녈깇�녈깂��궧�듽긿�쀣궥�㎯긿�덀굮岳앮똻�쀣�곫А��궠�잆긿�덆슋�ュ룚孃쀣걬�뚣굥�녈꺍�녴꺍�꾠겘�볝겗�밤깏�껁깤�룔깾�껁깉�㎯걲�귙걮�잆걣�c겍�곩컩�쀣겎�귚퐳璵�깂�ゃ꺖�ュ쨯�담굮�졼걟�잌풄�칌ommit�녈깯�녈깋�믣츪烏뚣걲�뗥뎺�ャ�� `add` �녈깯�녈깋�믢슴�ⓦ걮�곫뼭�쀣걚�뺛궊�ㅳ꺂�얇걼��쨯�담걬�뚣걼�뺛궊�ㅳ꺂�믡궎�녈깈�껁궚�밤겓瓦썲뒥�쇻굥恙낁쫨�뚣걗�듽겲�쇻��" #. type: Plain text #: en/git-add.txt:36 #, priority:300 msgid "This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index." -msgstr "�볝겗�녈깯�녈깋��궠�잆긿�덀걲�뗥뎺�ヨ쨭�겼썮若잒죱�쇻굥�볝겏�뚣겎�띲겲�쇻�귝뙁若싥걬�뚣걼�뺛궊�ㅳ꺂��궠�녈깇�녈깂��겳�똞dd�녈깯�녈깋�㎬옙�졼걬�뚣겲�쇻�귝А��궠�잆긿�덀겓孃뚨텥��쨯�담굮�ャ굙�뗥졃�덀겘�� `git add`�믣냽佯╉�곩츪烏뚣걮�╉�곫뼭�쀣걚�녈꺍�녴꺍�꾠굮�ㅳ꺍�뉎긿��궧�ヨ옙�졼걲�뗥퓚誤곥걣�귙굤�얇걲��" +msgstr "�볝겗�녈깯�녈깋��궠�잆긿�덀걲�뗥뎺�ヨ쨭�겼썮若잒죱�쇻굥�볝겏�뚣겎�띲겲�쇻�귝뙁若싥걬�뚣걼�뺛궊�ㅳ꺂��궠�녈깇�녈깂��겳�똞dd�녈깯�녈깋�㎬옙�졼걬�뚣겲�쇻�귝А��궠�잆긿�덀겓孃뚨텥��쨯�담굮�ャ굙�뗥졃�덀겘�� `git add` �믣냽佯╉�곩츪烏뚣걮�╉�곫뼭�쀣걚�녈꺍�녴꺍�꾠굮�ㅳ꺍�뉎긿��궧�ヨ옙�졼걲�뗥퓚誤곥걣�귙굤�얇걲��" #. type: Plain text #: en/git-add.txt:39 #, priority:300 msgid "The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit." -msgstr "`git status`�녈깯�녈깋�믢슴�ⓦ걮�곫А��궠�잆긿�덀겗�잆굙�ャ궧�녴꺖�멥꺍�겹걬�뚣굥�곩쨯�담걬�뚣겍�꾠굥�뺛궊�ㅳ꺂��쫩誤곥겗�뽩풓�믦죱�녴걪�ⓦ걣�㎯걤�얇걲��" +msgstr "`git status` �녈깯�녈깋�믢슴�ⓦ걮�곫А��궠�잆긿�덀겗�잆굙�ャ궧�녴꺖�멥꺍�겹걬�뚣굥�곩쨯�담걬�뚣겍�꾠굥�뺛궊�ㅳ꺂��쫩誤곥겗�뽩풓�믦죱�녴걪�ⓦ걣�㎯걤�얇걲��" #. type: Plain text #: en/git-add.txt:46 #, priority:300 msgid "The `git add` command will not add ignored files by default. If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The 'git add' command can be used to add ignored files with the `-f` (force) option." -msgstr "`git add` �녈깯�녈깋��깈�뺛궔�ャ깉�㎯겘�↑쫿�뺛굦�뗣깢�▲궎�ャ굮瓦썲뒥�쀣겲�쎼굯�귞꽒誤뽧걬�뚣굥�뺛궊�ㅳ꺂�뚣궠�욁꺍�됥꺀�ㅳ꺍�㎪삇鹽븀쉪�ユ뙁若싥걬�뚣걼�닷릦�� `git add` ��꽒誤뽧걬�뚣굥�뺛궊�ㅳ꺂��꺁�밤깉�㎩ㅁ�쀣걮�얇걲�괛it�ャ굠�c겍若잒죱�뺛굦�잆깈�c꺃��깉�ゅ냽躍겹겲�잆겘�뺛궊�ㅳ꺂�띲궛��깣��릤竊덀궥�㎯꺂��뎺�ャ궛��깣�믣폊�⑨펹�ャ굠�c겍誤뗣겇�뗣겂�잏꽒誤뽧걬�뚣굥�뺛궊�ㅳ꺂��퍢�c겍�↑쫿�뺛굦�얇걲��'git add' �녈깯�녈깋�믢슴�ⓦ걲�뗣겏�� `-f`竊늗orce竊됥궕�쀣궥�㎯꺍�믢슴�ⓦ걲�뗣걪�ⓦ겎�↑쫿�뺛굦�뗣깢�▲궎�ャ굮瓦썲뒥�쇻굥�볝겏�뚣겎�띲겲�쇻��" +msgstr "`git add` �녈깯�녈깋��깈�뺛궔�ャ깉�㎯겘�↑쫿�뺛굦�뗣깢�▲궎�ャ굮瓦썲뒥�쀣겲�쎼굯�귞꽒誤뽧걬�뚣굥�뺛궊�ㅳ꺂�뚣궠�욁꺍�됥꺀�ㅳ꺍�㎪삇鹽븀쉪�ユ뙁若싥걬�뚣걼�닷릦�� `git add` ��꽒誤뽧걬�뚣굥�뺛궊�ㅳ꺂��꺁�밤깉�㎩ㅁ�쀣걮�얇걲�괛it�ャ굠�c겍若잒죱�뺛굦�잆깈�c꺃��깉�ゅ냽躍겹겲�잆겘�뺛궊�ㅳ꺂�띲궛��깣��릤竊덀궥�㎯꺂��뎺�ャ궛��깣�믣폊�⑨펹�ャ굠�c겍誤뗣겇�뗣겂�잏꽒誤뽧걬�뚣굥�뺛궊�ㅳ꺂��퍢�c겍�↑쫿�뺛굦�얇걲��'git add' �녈깯�녈깋�믢슴�ⓦ걲�뗣겏�� `-f` 竊늗orce竊됥궕�쀣궥�㎯꺍�믢슴�ⓦ걲�뗣걪�ⓦ겎�↑쫿�뺛굦�뗣깢�▲궎�ャ굮瓦썲뒥�쇻굥�볝겏�뚣겎�띲겲�쇻��" #. type: Plain text #: en/git-add.txt:49 #, priority:300 msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit." -msgstr "�녈깱�껁깉�ャ궠�녈깇�녈깂�믦옙�졼걲�뗥닪��뼶力뺛겓�ㅳ걚�╉겘�걄inkgit:git-commit [1]�믣뢿�㎯걮�╉걦�졼걬�꾠��" +msgstr "�녈깱�껁깉�ャ궠�녈깇�녈깂�믦옙�졼걲�뗥닪��뼶力뺛겓�ㅳ걚�╉겘�걄inkgit:git-commit[1] �믣뢿�㎯걮�╉걦�졼걬�꾠��" #. type: Title - #: en/git-add.txt:52 en/git-am.txt:29 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:65 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:79 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:40 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:120 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:42 en/git-hash-object.txt:24 en/git-help.txt:46 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktag.txt:41 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:78 en/git-quiltimport.txt:32 en/git-range-diff.txt:45 en/git-read-tree.txt:32 en/git-rebase.txt:205 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:104 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:155 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:158 en/git-write-tree.txt:29 @@ -6431,7 +6431,7 @@ msgstr "<pathspec> �ヤ��담걲�뗣궓�녈깉�ゃ걣�쇻겎�ャ걗�뗥졃�덀겓��겳 #: en/git-add.txt:129 #, priority:300 msgid "If no <pathspec> is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)." -msgstr "u`�ゃ깤�룔깾�녈굮鵝욍겂�잆겏�띲겓<pathspec>�뚥툗�덀굢�뚣겍�꾠겒�꾢졃�덀�곦퐳璵�깂�ゃ꺖�ⓧ퐪�ャ걗�뗣걲�밤겍��옙瓮▲깢�▲궎�ャ걣�닸뼭�뺛굦�얇걲竊덂룮�꾠깘�쇈궦�㎯꺍�췍it�㎯겘�곫쎍�겹겗野얕괌�믡궖�с꺍�덀깈�c꺃��깉�ゃ겏�앫겗�듐깣�뉎궍�с궚�덀꺁�ラ솏若싥걮�╉걚�얇걮�잞펹��" +msgstr "`-u` �ゃ깤�룔깾�녈굮鵝욍겂�잆겏�띲겓<pathspec>�뚥툗�덀굢�뚣겍�꾠겒�꾢졃�덀�곦퐳璵�깂�ゃ꺖�ⓧ퐪�ャ걗�뗣걲�밤겍��옙瓮▲깢�▲궎�ャ걣�닸뼭�뺛굦�얇걲竊덂룮�꾠깘�쇈궦�㎯꺍�췍it�㎯겘�곫쎍�겹겗野얕괌�믡궖�с꺍�덀깈�c꺃��깉�ゃ겏�앫겗�듐깣�뉎궍�с궚�덀꺁�ラ솏若싥걮�╉걚�얇걮�잞펹��" #. type: Labeled list #: en/git-add.txt:130 en/git-repack.txt:49 en/git-svn.txt:418 @@ -6455,7 +6455,7 @@ msgstr "鵝쒏��꾠꺁�쇈겓<pathspec>�ヤ��담걲�뗣깢�▲궎�ャ걣�귙굥�닷릦 #: en/git-add.txt:142 #, priority:300 msgid "If no <pathspec> is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)." -msgstr "`A`�ゃ깤�룔깾�념슴�ⓩ셽��<pathspec>�뚧뙁若싥걬�뚣겍�꾠겒�꾢졃�덀�곦퐳璵�깂�ゃ꺖�ⓧ퐪��뀲�╉겗�뺛궊�ㅳ꺂�뚧쎍�겹걬�뚣겲�숋펷�ㅳ걚�먦꺖�멥깾�녈겗Git�㎯겘�곫쎍�겼�穩▲굮�ャ꺃�녈깉�뉎궍�с궚�덀꺁�ⓦ걹��궢�뽧깈�c꺃��깉�ゃ겓�먨츣�쀣겍�꾠겲�쀣걼竊됥��" +msgstr "`-A` �ゃ깤�룔깾�념슴�ⓩ셽��<pathspec>�뚧뙁若싥걬�뚣겍�꾠겒�꾢졃�덀�곦퐳璵�깂�ゃ꺖�ⓧ퐪��뀲�╉겗�뺛궊�ㅳ꺂�뚧쎍�겹걬�뚣겲�숋펷�ㅳ걚�먦꺖�멥깾�녈겗Git�㎯겘�곫쎍�겼�穩▲굮�ャ꺃�녈깉�뉎궍�с궚�덀꺁�ⓦ걹��궢�뽧깈�c꺃��깉�ゃ겓�먨츣�쀣겍�꾠겲�쀣걼竊됥��" #. type: Labeled list #: en/git-add.txt:143 @@ -6581,7 +6581,7 @@ msgstr "--pathspec-from-file=<file>" #: en/git-add.txt:205 en/git-checkout.txt:323 en/git-commit.txt:328 en/git-reset.txt:120 en/git-restore.txt:136 en/git-rm.txt:93 en/git-stash.txt:217 #, priority:300 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`." -msgstr "Pathspec��궠�욁꺍�됥꺀�ㅳ꺍��폊�겹겗餓c굩�듽겓 `<file>` �㎪륫�뺛굦�얇걲��<file>` �뚧�閻뷩겓 `-` �㎯걗�뚣겙�곫쮽繹뽩뀯�쎼걣鵝욜뵪�뺛굦�얇걲�괦athspec��쫨榮졼겘LF�얇걼�츮R/LF�㎩뙷�뉎굢�뚣겲�쇻�괦athspec��쫨榮졼겘�곮Þ若싧쨯�� `core.quotePath` (linkgit:git-config[1]�귞뀱) �㎬が�롢걬�뚣겍�꾠굥�덀걝�ャ�곩폊�ⓦ걲�뗣걪�ⓦ걣�㎯걤�얇걲�귙겲�잆��`--pathspec-file-nul`�꾠궛��꺖�먦꺂��`--literal-pathspecs`�귛뢿�㎯걮�╉걦�졼걬�꾠��" +msgstr "Pathspec��궠�욁꺍�됥꺀�ㅳ꺍��폊�겹겗餓c굩�듽겓 `<file>` �㎪륫�뺛굦�얇걲�� `<file>` �뚧�閻뷩겓 `-` �㎯걗�뚣겙�곫쮽繹뽩뀯�쎼걣鵝욜뵪�뺛굦�얇걲�괦athspec��쫨榮졼겘LF�얇걼�츮R/LF�㎩뙷�뉎굢�뚣겲�쇻�괦athspec��쫨榮졼겘�곮Þ若싧쨯�� `core.quotePath` (linkgit:git-config[1]�귞뀱) �㎬が�롢걬�뚣겍�꾠굥�덀걝�ャ�곩폊�ⓦ걲�뗣걪�ⓦ걣�㎯걤�얇걲�귙겲�잆��`--pathspec-file-nul` �꾠궛��꺖�먦꺂�� `--literal-pathspecs` �귛뢿�㎯걮�╉걦�졼걬�꾠��" #. type: Labeled list #: en/git-add.txt:206 en/git-checkout.txt:324 en/git-commit.txt:329 en/git-reset.txt:121 en/git-restore.txt:137 en/git-rm.txt:94 en/git-stash.txt:218 @@ -6593,7 +6593,7 @@ msgstr "--pathspec-file-nul" #: en/git-add.txt:210 en/git-checkout.txt:328 en/git-commit.txt:333 en/git-reset.txt:125 en/git-restore.txt:141 en/git-rm.txt:98 en/git-stash.txt:224 #, priority:300 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)." -msgstr "`--pathspec-from-file`�㎯겗�욘꼷�녈굮�곥걾�얇걲�괦athspec��쫨榮졼겘NUL�뉐춻�㎩뙷�뉎굢�뚣�곦퍟��걲�밤겍��뻼耶쀣겘�뉐춻�싥굤�ヨ㎗�덀걬�뚣겲�숋펷�배죱�꾢폊�①Е�믣맜��竊됥��" +msgstr "`--pathspec-from-file` �㎯겗�욘꼷�녈굮�곥걾�얇걲�괦athspec��쫨榮졼겘NUL�뉐춻�㎩뙷�뉎굢�뚣�곦퍟��걲�밤겍��뻼耶쀣겘�뉐춻�싥굤�ヨ㎗�덀걬�뚣겲�숋펷�배죱�꾢폊�①Е�믣맜��竊됥��" #. type: Labeled list #: en/git-add.txt:211 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:363 en/git-commit.txt:397 en/git-grep.txt:294 en/git-ls-files.txt:190 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:126 en/git-restore.txt:142 en/git-rm.txt:62 en/git-stash.txt:232 en/git-update-index.txt:226 en/git-verify-pack.txt:36 @@ -6617,7 +6617,7 @@ msgstr "堊�" #: en/git-add.txt:222 #, priority:300 msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:" -msgstr "`Documentation` �뉎궍�с궚�덀꺁�ⓦ걹��궢�뽧깈�c꺃��깉�ゃ겓�귙굥�쇻겧�╉겗`*.txt`�뺛궊�ㅳ꺂��냵若밤굮瓦썲뒥�쀣겲�쇻��" +msgstr "`Documentation` �뉎궍�с궚�덀꺁�ⓦ걹��궢�뽧깈�c꺃��깉�ゃ겓�귙굥�쇻겧�╉겗 `*.txt` �뺛궊�ㅳ꺂��냵若밤굮瓦썲뒥�쀣겲�쇻��" #. type: delimited block - #: en/git-add.txt:225 @@ -6685,7 +6685,7 @@ msgstr "" #: en/git-add.txt:261 #, priority:300 msgid "You also could say `s` or `sta` or `status` above as long as the choice is unique." -msgstr "�멩뒢�㏂걣訝��뤵겎�귙굦�겹�곦툓鼇섅겗`s`��`sta`��`status`�②��녴걪�ⓦ굚�㎯걤�얇걲��" +msgstr "�멩뒢�㏂걣訝��뤵겎�귙굦�겹�곦툓鼇섅겗 `s` �� `sta` ��`status` �②��녴걪�ⓦ굚�㎯걤�얇걲��" #. type: Plain text #: en/git-add.txt:263 @@ -6703,7 +6703,7 @@ msgstr "status" #: en/git-add.txt:271 #, priority:300 msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:" -msgstr "�볝굦���곥걹�뚣걻�뚣겗�묆궧�ャ겇�꾠겍�갎EAD�ⓦ궎�녈깈�껁궚�밤겗�볝겗鸚됧뙑竊덀겇�얇굤��`git commit`�②��덀겙�녈깱�껁깉�뺛굦�뗣굚��펹�ⓦ�곥궎�녈깈�껁궚�밤겏鵝쒏��꾠꺁�쇈깢�▲궎�ャ겗�볝겗鸚됧뙑竊덀겇�얇굤��`git commit`��뎺��`git add`�믢슴�c겍�뺛굢�ャ궧�녴꺖�멥꺍�겹걲�뗣걪�ⓦ걣�㎯걤�뗣굚��펹�믥ㅊ�쀣겍�꾠겲�쇻�� �뷴뒟堊뗣겘餓δ툔��굠�녴겓�ゃ굤�얇걲��" +msgstr "�볝굦���곥걹�뚣걻�뚣겗�묆궧�ャ겇�꾠겍�갎EAD�ⓦ궎�녈깈�껁궚�밤겗�볝겗鸚됧뙑竊덀겇�얇굤��`git commit` �②��덀겙�녈깱�껁깉�뺛굦�뗣굚��펹�ⓦ�곥궎�녈깈�껁궚�밤겏鵝쒏��꾠꺁�쇈깢�▲궎�ャ겗�볝겗鸚됧뙑竊덀겇�얇굤��`git commit` ��뎺�� `git add` �믢슴�c겍�뺛굢�ャ궧�녴꺖�멥꺍�겹걲�뗣걪�ⓦ걣�㎯걤�뗣굚��펹�믥ㅊ�쀣겍�꾠겲�쇻�� �뷴뒟堊뗣겘餓δ툔��굠�녴겓�ゃ굤�얇걲��" #. type: delimited block - #: en/git-add.txt:276 @@ -6875,7 +6875,7 @@ msgstr "�묆긿�곥겗渶③썓" #: en/git-add.txt:374 #, priority:300 msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them." -msgstr "git add -e` �믣츪烏뚣걲�뗣걢�곥궎�녈궭�⒲궚�녴궍�뽧겒 hunk �삠꺃��궭�뗣굢 `e` �믧겦�욁걲�뗣겏�곥궓�뉎궍�욍겎�묆긿�곥걣�뗣걢�뚣�곥궓�뉎궍�욍걣永귚틙�쇻굥�ⓦ�곭탳�쒌걣�ㅳ꺍�뉎긿��궧�ラ겑�ⓦ걬�뚣겲�쇻�귙깙�껁긽�ャ겘�ょ뵳�ュ쨯�담굮�졼걟�뗣걪�ⓦ걣�㎯걤�얇걲�뚣�곩쨯�담겓�덀겂�╉겘曆룝묽�믤떅�뤹탳�쒌겓�ゃ겂�잆굤�곲겑�ⓦ겎�띲겒�꾠깙�껁긽�ャ겒�c겍�쀣겲�녴걪�ⓦ굚�귙굥��겎力ⓩ꼷�뚦퓚誤곥겎�쇻�� �귙걮�곥걪��뱧鵝쒌굮若뚦뀲�ヤ릎閭㏂걮�잆걚竊덀겇�얇굤�곥궎�녈깈�껁궚�밤겓鵝뺛굚�겹걮�꾠굚��굮�γ굦�ゃ걚�덀걝�ャ걮�잆걚竊됧졃�덀겓���곩뜕榮붵겓�묆긿�곥겗�쇻겧�╉겗烏뚣굮�딃솮�쀣겍�뤵걽�뺛걚�귚빳訝뗣겗�ゃ궧�덀겘�곥깙�껁긽��릎�㎯굠�뤺쫳�됥굦�뗣굚��겏�곥걹�뚣겓野얇걮�╉겑��굠�녴겒渶③썓�띴퐳�뚧꼷�녈굮�곥겇�뗣굮沃ф삇�쀣겍�꾠겲�쇻��" +msgstr "`git add -e` �믣츪烏뚣걲�뗣걢�곥궎�녈궭�⒲궚�녴궍�뽧겒 hunk �삠꺃��궭�뗣굢 `e` �믧겦�욁걲�뗣겏�곥궓�뉎궍�욍겎�묆긿�곥걣�뗣걢�뚣�곥궓�뉎궍�욍걣永귚틙�쇻굥�ⓦ�곭탳�쒌걣�ㅳ꺍�뉎긿��궧�ラ겑�ⓦ걬�뚣겲�쇻�귙깙�껁긽�ャ겘�ょ뵳�ュ쨯�담굮�졼걟�뗣걪�ⓦ걣�㎯걤�얇걲�뚣�곩쨯�담겓�덀겂�╉겘曆룝묽�믤떅�뤹탳�쒌겓�ゃ겂�잆굤�곲겑�ⓦ겎�띲겒�꾠깙�껁긽�ャ겒�c겍�쀣겲�녴걪�ⓦ굚�귙굥��겎力ⓩ꼷�뚦퓚誤곥겎�쇻�� �귙걮�곥걪��뱧鵝쒌굮若뚦뀲�ヤ릎閭㏂걮�잆걚竊덀겇�얇굤�곥궎�녈깈�껁궚�밤겓鵝뺛굚�겹걮�꾠굚��굮�γ굦�ゃ걚�덀걝�ャ걮�잆걚竊됧졃�덀겓���곩뜕榮붵겓�묆긿�곥겗�쇻겧�╉겗烏뚣굮�딃솮�쀣겍�뤵걽�뺛걚�귚빳訝뗣겗�ゃ궧�덀겘�곥깙�껁긽��릎�㎯굠�뤺쫳�됥굦�뗣굚��겏�곥걹�뚣겓野얇걮�╉겑��굠�녴겒渶③썓�띴퐳�뚧꼷�녈굮�곥겇�뗣굮沃ф삇�쀣겍�꾠겲�쇻��" #. type: Labeled list #: en/git-add.txt:376 @@ -6887,7 +6887,7 @@ msgstr "瓦썲뒥�녈꺍�녴꺍��" #: en/git-add.txt:380 #, priority:300 msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them." -msgstr "瓦썲뒥�뺛굦�잆궠�녈깇�녈깂���곥��{plus}�띲겎冶뗣겲�뗨죱�㎬〃�뺛굦�얇걲�귟옙�졼걬�뚣걼烏뚣굮�딃솮�쇻굥�볝겏�㎯�곥궧�녴꺖�멥꺍�겹굮�꿔걧�볝겏�뚣겎�띲겲�쇻��" +msgstr "瓦썲뒥�뺛굦�잆궠�녈깇�녈깂����\"{plus}\" �㎩쭓�얇굥烏뚣겎烏ⓦ걬�뚣겲�쇻�귟옙�졼걬�뚣걼烏뚣굮�딃솮�쇻굥�볝겏�㎯�곥궧�녴꺖�멥꺍�겹굮�꿔걧�볝겏�뚣겎�띲겲�쇻��" #. type: Labeled list #: en/git-add.txt:381 @@ -6899,7 +6899,7 @@ msgstr "�딃솮�뺛굦�잆궠�녈깇�녈깂" #: en/git-add.txt:385 #, priority:300 msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)." -msgstr "�딃솮�뺛굦�잆궠�녈깇�녈깂���곥��-�띲겎冶뗣겲�뗨죱�㎬〃�뺛굦�얇걲�귙걪��\"-\"��\" \"竊덀궧�싥꺖�뱄펹�ュ쨯�쎼걲�뗣걪�ⓦ겎�곩뎷�ㅳ걬�뚣걼�볝겏�믤폇�뷩걲�뗣걪�ⓦ걣�㎯걤�얇걲��" +msgstr "�딃솮�뺛굦�잆궠�녈깇�녈깂����\"-\" �㎩쭓�얇굥烏뚣겎烏ⓦ걬�뚣겲�쇻�귙걪�� \"-\" �� \" \"竊덀궧�싥꺖�뱄펹�ュ쨯�쎼걲�뗣걪�ⓦ겎�곩뎷�ㅳ걬�뚣걼�볝겏�믤폇�뷩걲�뗣걪�ⓦ걣�㎯걤�얇걲��" #. type: Labeled list #: en/git-add.txt:386 @@ -14311,7 +14311,7 @@ msgstr "" #: en/git-clone.txt:30 #, priority:300 msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch --remotes`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch." -msgstr "�ゃ깮�멥깉�ゃ굮�겹걼�ヤ퐳�먦걬�뚣걼�뉎궍�с궚�덀꺁�ャ궚��꺖�녈걮�곥궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�꾠깣�⒲꺍�곥겓�ゃ깴�쇈깉�덀꺀�껁궘�녈궛�뽧꺀�녈긽�믢퐳�먦걮竊�`git branch --remotes`�㎫▶沃띲겎�띲겲�숋펹�곥궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�얍쑉�㏂궚�녴궍�뽧겒�뽧꺀�녈긽�뗣굢�뺛궔�쇈궚�뺛굦�잌닜�잆깣�⒲꺍�곥굮鵝쒏닇�곥긽�㎯긿��궋�╉깉�쀣겲�쇻��" +msgstr "�ゃ깮�멥깉�ゃ굮�겹걼�ヤ퐳�먦걬�뚣걼�뉎궍�с궚�덀꺁�ャ궚��꺖�녈걮�곥궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�꾠깣�⒲꺍�곥겓�ゃ깴�쇈깉�덀꺀�껁궘�녈궛�뽧꺀�녈긽�믢퐳�먦걮竊�`git branch --remotes` �㎫▶沃띲겎�띲겲�숋펹�곥궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�얍쑉�㏂궚�녴궍�뽧겒�뽧꺀�녈긽�뗣굢�뺛궔�쇈궚�뺛굦�잌닜�잆깣�⒲꺍�곥굮鵝쒏닇�곥긽�㎯긿��궋�╉깉�쀣겲�쇻��" #. type: Plain text #: en/git-clone.txt:36 @@ -14341,7 +14341,7 @@ msgstr "��꺆�쇈꺍�믢퐳�먦걲�뗣꺁�앫궦�덀꺁�뚣꺆�쇈궖�ャ깯�룔꺍訝듽겓 #: en/git-clone.txt:60 #, priority:300 msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op. If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead." -msgstr "�ゃ깮�멥깉�ゃ걣��꺖�ャ꺂�묆궧竊덁풃竊�`/path/to/repo`竊됥겎�뉐츣�뺛굦�╉걚�뗥졃�덀겘�곥걪�뚣걣�뉎깢�⒲꺂�덀겎�귙굤��--local ��읃�х쉪�ヤ퐬�귙걮�얇걵�볝�� �ゃ깮�멥깉�ゃ걣 URL �ⓦ걮��뙁若싥걬�뚣겍�꾠굥�닷릦���곥걪��깢�⒲궛��꽒誤뽧걬�뚣겲�숋펷��꺖�ャ꺂�㎯겗���⒴뙑�귚슴�ⓦ걬�뚣겲�쎼굯竊됥�� `--no-local`�믤뙁若싥걲�뗣겏��`/path/to/repo`�뚧뙁若싥걬�뚣걼�ⓦ걤��깈�뺛궔�ャ깉�믢툓�멥걤�쀣�곦빰�뤵굤�ラ�싧만�췍it�덀꺀�녈궧�앫꺖�덀굮鵝욜뵪�쀣겲�쇻��" +msgstr "�ゃ깮�멥깉�ゃ걣��꺖�ャ꺂�묆궧竊덁풃: `/path/to/repo`竊됥겎�뉐츣�뺛굦�╉걚�뗥졃�덀겘�곥걪�뚣걣�뉎깢�⒲꺂�덀겎�귙굤��--local ��읃�х쉪�ヤ퐬�귙걮�얇걵�볝�� �ゃ깮�멥깉�ゃ걣 URL �ⓦ걮��뙁若싥걬�뚣겍�꾠굥�닷릦���곥걪��깢�⒲궛��꽒誤뽧걬�뚣겲�숋펷��꺖�ャ꺂�㎯겗���⒴뙑�귚슴�ⓦ걬�뚣겲�쎼굯竊됥�� `--no-local` �믤뙁若싥걲�뗣겏�� `/path/to/repo` �뚧뙁若싥걬�뚣걼�ⓦ걤��깈�뺛궔�ャ깉�믢툓�멥걤�쀣�곦빰�뤵굤�ラ�싧만�췍it�덀꺀�녈궧�앫꺖�덀굮鵝욜뵪�쀣겲�쇻��" #. type: Plain text #: en/git-clone.txt:64 @@ -14350,10 +14350,7 @@ msgid "" "*NOTE*: this operation can race with concurrent modification to the\n" "source repository, similar to running `cp -r src dst` while modifying\n" "`src`.\n" -msgstr "" -"*力ⓩ꼷*: �볝겗�띴퐳���곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�뚧셽鸚됪쎍�①ザ�덀걲�뗥룾�썸�㎯걣�귙굤�얇걲��\n" -"�볝겗�띴퐳���곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�뚧셽鸚됪쎍�①ザ�덀걲�뗥룾�썸�㎯걣�귙굤�얇걲�귙걪�뚣겘��`src` �믣쨯�담걮�ゃ걣�� `cp -r src dst` �믣츪烏뚣걲�뗣겗�ⓨ릪�섅겎�쇻��\n" -"src` �믣쨯�담걮�ゃ걣�� `cp -r src dst` �믣츪烏뚣걲�뗣겗�ⓨ릪�섅굠�녴겓�곥걪��뱧鵝쒌겘�썬꺖�밤꺁�앫궦�덀꺁��릪�귛쨯�담겏塋뜹릦�쇻굥��꺗�㎯걣�귙굤�얇걲��\n" +msgstr "*力ⓩ꼷*: �볝겗�띴퐳���곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�뚧셽鸚됪쎍�①ザ�덀걲�뗥룾�썸�㎯걣�귙굤�얇걲��\n�볝겗�띴퐳���곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�뚧셽鸚됪쎍�①ザ�덀걲�뗥룾�썸�㎯걣�귙굤�얇걲�귙걪�뚣겘�� `src` �믣쨯�담걮�ゃ걣�� `cp -r src dst` �믣츪烏뚣걲�뗣겗�ⓨ릪�섅겎�쇻��\n`src` �믣쨯�담걮�ゃ걣�� `cp -r src dst` �믣츪烏뚣걲�뗣겗�ⓨ릪�섅굠�녴겓�곥걪��뱧鵝쒌겘�썬꺖�밤꺁�앫궦�덀꺁��릪�귛쨯�담겏塋뜹릦�쇻굥��꺗�㎯걣�귙굤�얇걲��\n" #. type: Labeled list #: en/git-clone.txt:65 @@ -14365,7 +14362,7 @@ msgstr "--no-hardlinks" #: en/git-clone.txt:70 #, priority:300 msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository." -msgstr "��꺖�ャ꺂�뺛궊�ㅳ꺂�룔궧�녴깲訝듽겗�ゃ깮�멥깉�ゃ걢�됥궚��꺖�념퐳�먦깤��궩�밤굮凉룟댍�쀣겍�곥깗�쇈깋�ゃ꺍��굮鵝욜뵪�쇻굥��겎��겒��'.git/objects' �뉎궍�с궚�덀꺁��툔�ャ깢�▲궎�ャ굮�녈깞�쇈걮�얇걲�귙걪�뚣겘�곥꺁�앫궦�덀꺁��깘�껁궚�㏂긿�쀣굮鵝쒏닇�쇻굥�닷릦�ラ겑�쀣겍�꾠겲�쇻��" +msgstr "��꺖�ャ꺂�뺛궊�ㅳ꺂�룔궧�녴깲訝듽겗�ゃ깮�멥깉�ゃ걢�됥궚��꺖�념퐳�먦깤��궩�밤굮凉룟댍�쀣겍�곥깗�쇈깋�ゃ꺍��굮鵝욜뵪�쇻굥��겎��겒�� `.git/objects` �뉎궍�с궚�덀꺁��툔�ャ깢�▲궎�ャ굮�녈깞�쇈걮�얇걲�귙걪�뚣겘�곥꺁�앫궦�덀꺁��깘�껁궚�㏂긿�쀣굮鵝쒏닇�쇻굥�닷릦�ラ겑�쀣겍�꾠겲�쇻��" #. type: Labeled list #: en/git-clone.txt:72 @@ -14377,7 +14374,7 @@ msgstr "--shared" #: en/git-clone.txt:78 #, priority:300 msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository. The resulting repository starts out without any object of its own." -msgstr "��꺆�쇈꺍�믢퐳�먦걲�뗣꺁�앫궦�덀꺁�뚣꺆�쇈궖�ャ깯�룔꺍訝듽겓�귙굥�닷릦�곥깗�쇈깋�ゃ꺍��굮鵝욜뵪�쇻굥餓c굩�듽겓�곥궕�뽧궦�㎯궚�덀굮�썬꺖�밤꺁�앫궦�덀꺁�ⓨ뀻�됥걲�뗣굠�녴겓 `.git / objects / info / alternates`�믦눎�뺟쉪�ヨÞ若싥걮�얇걲�귞탳�쒌겗�ゃ깮�멥깉�ゃ겘�곭떖�ゃ겗�ゃ깣�멥궒��깉�ゃ걮�㏝뼀冶뗣걬�뚣겲�쇻��" +msgstr "��꺆�쇈꺍�믢퐳�먦걲�뗣꺁�앫궦�덀꺁�뚣꺆�쇈궖�ャ깯�룔꺍訝듽겓�귙굥�닷릦�곥깗�쇈깋�ゃ꺍��굮鵝욜뵪�쇻굥餓c굩�듽겓�곥궕�뽧궦�㎯궚�덀굮�썬꺖�밤꺁�앫궦�덀꺁�ⓨ뀻�됥걲�뗣굠�녴겓 `.git/objects/info/alternates` �믦눎�뺟쉪�ヨÞ若싥걮�얇걲�귞탳�쒌겗�ゃ깮�멥깉�ゃ겘�곭떖�ゃ겗�ゃ깣�멥궒��깉�ゃ걮�㏝뼀冶뗣걬�뚣겲�쇻��" #. type: Plain text #: en/git-clone.txt:88 @@ -14392,28 +14389,19 @@ msgid "" "which automatically call `git maintenance run --auto`. (See\n" "linkgit:git-maintenance[1].) If these objects are removed and were referenced\n" "by the cloned repository, then the cloned repository will become corrupt.\n" -msgstr "" -"*力ⓩ꼷*: �볝굦��뜳�뷩겒�띴퐳�ャ겒�듽걝�뗣걼�곥�곭릤鰲c겎�띲겒�꾦솏�듾슴��*�쀣겒�꾠겎*\n" -"�뤵걽�뺛걚�귙걪��궕�쀣궥�㎯꺍�믢슴�c겍�ゃ깮�멥깉�ゃ굮��꺆�쇈꺍�쀣�곥궫�쇈궧�ゃ깮�멥깉�ゃ겎\n" -"�뽧꺀�녈긽�믣뎷�ㅿ펷�귙굥�꾠겘�℡춼��궠�잆긿�덀굮�귞뀱�쀣겒�뤵겒�뗣굠�녴겒Git�녈깯�녈깋\n" -"�믢슴�⑨펹�쇻굥�ⓦ�곥걚�뤵겇�뗣겗�ゃ깣�멥궒��깉�뚦뢿�㎯걬�뚣겒�뤵겒�� (�귙굥�꾠겘�뜰굢\n" -"訝뗣걣��) �볝겏�뚣걗�듽겲�쇻��\n" -"�볝굦�됥겗�ゃ깣�멥궒��깉���곮눎�뺟쉪��`git maintenance run --auto`�믣뫜�녑눣�숅�싧만��\n" -"Git �띴퐳 (�잆겏�덀겙 `git commit`) �㎩뎷�ㅳ걬�뚣굥�뗣굚�쀣굦�얇걵�볝��(�귞뀱\n" -"linkgit:git-maintenance[1].) �귙걮�볝굦�됥겗�ゃ깣�멥궒��깉�뚦뎷�ㅳ걬�뚣�곥궚��꺖�녈꺁�앫궦�덀꺁\n" -"�뗣굢�귞뀱�뺛굦�╉걚�잌졃�덀겘�곥궚��꺖�녈꺁�앫궦�덀꺁�뚦즸�뚣겍�쀣겲�꾠겲�쇻��\n" +msgstr "*力ⓩ꼷*: �볝굦��뜳�뷩겒�띴퐳�ャ겒�듽걝�뗣걼�곥�곭릤鰲c겎�띲겒�꾦솏�듾슴�� *�쀣겒�꾠겎*\n�뤵걽�뺛걚�귙걪��궕�쀣궥�㎯꺍�믢슴�c겍�ゃ깮�멥깉�ゃ굮��꺆�쇈꺍�쀣�곥궫�쇈궧�ゃ깮�멥깉�ゃ겎\n�뽧꺀�녈긽�믣뎷�ㅿ펷�귙굥�꾠겘�℡춼��궠�잆긿�덀굮�귞뀱�쀣겒�뤵겒�뗣굠�녴겒Git�녈깯�녈깋\n�믢슴�⑨펹�쇻굥�ⓦ�곥걚�뤵겇�뗣겗�ゃ깣�멥궒��깉�뚦뢿�㎯걬�뚣겒�뤵겒�� (�귙굥�꾠겘�뜰굢\n訝뗣걣��) �볝겏�뚣걗�듽겲�쇻��\n�볝굦�됥겗�ゃ깣�멥궒��깉���곮눎�뺟쉪�� `git maintenance run --auto` �믣뫜�녑눣�숅�싧만��\nGit �띴퐳 (�잆겏�덀겙 `git commit`) �㎩뎷�ㅳ걬�뚣굥�뗣굚�쀣굦�얇걵�볝��(�귞뀱\nlinkgit:git-maintenance[1].) �귙걮�볝굦�됥겗�ゃ깣�멥궒��깉�뚦뎷�ㅳ걬�뚣�곥궚��꺖�녈꺁�앫궦�덀꺁\n�뗣굢�귞뀱�뺛굦�╉걚�잌졃�덀겘�곥궚��꺖�녈꺁�앫궦�덀꺁�뚦즸�뚣겍�쀣겲�꾠겲�쇻��\n" #. type: Plain text #: en/git-clone.txt:94 #, priority:300 msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`. It is safe, however, to run `git gc`, which uses the `--local` option by default." -msgstr "�ゃ걡��`--shared` �㎯궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겎 `git repack` �� `--local` �ゃ깤�룔깾�녈굮�뉐츣�쎼걳�� 若잒죱�쇻굥�ⓦ�곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�ゃ깣�멥궒��깉�뚣궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�묆긿��겓�녈깞�쇈걬�뚣��`clone --shared` �ャ굠�뗣깈�c궧��궧�싥꺖�밤겗影�榮꾢듅�쒌걣�ゃ걦�ゃ굤�얇걲�� �쀣걢�쀣��`--local`�ゃ깤�룔깾�녈굮�뉎깢�⒲꺂�덀겎鵝욜뵪�쇻굥`git gc`�믣츪烏뚣걲�뗣걪�ⓦ겘若됧뀲�㎯걲��" +msgstr "�ゃ걡��`--shared` �㎯궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겎 `git repack` �� `--local` �ゃ깤�룔깾�녈굮�뉐츣�쎼걳�� 若잒죱�쇻굥�ⓦ�곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�ゃ깣�멥궒��깉�뚣궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�묆긿��겓�녈깞�쇈걬�뚣��`clone --shared` �ャ굠�뗣깈�c궧��궧�싥꺖�밤겗影�榮꾢듅�쒌걣�ゃ걦�ゃ굤�얇걲�� �쀣걢�쀣�� `--local` �ゃ깤�룔깾�녈굮�뉎깢�⒲꺂�덀겎鵝욜뵪�쇻굥 `git gc` �믣츪烏뚣걲�뗣걪�ⓦ겘若됧뀲�㎯걲��" #. type: Plain text #: en/git-clone.txt:98 #, priority:300 msgid "If you want to break the dependency of a repository cloned with `--shared` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository." -msgstr "`--shared`�㎯궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�썬꺖�밤꺁�앫궦�덀꺁�멥겗堊앭춼�㏘퓗�믦㎗易덀걮�잆걚�닷릦���곩뜕榮붵겓`git repack -a`�믣츪烏뚣걮�╉�곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�쇻겧�╉겗�ゃ깣�멥궒��깉�믡궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�묆긿��겓�녈깞�쇈걮�얇걲��" +msgstr "`--shared` �㎯궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�썬꺖�밤꺁�앫궦�덀꺁�멥겗堊앭춼�㏘퓗�믦㎗易덀걮�잆걚�닷릦���곩뜕榮붵겓 `git repack -a` �믣츪烏뚣걮�╉�곥궫�쇈궧�ゃ깮�멥깉�ゃ겗�쇻겧�╉겗�ゃ깣�멥궒��깉�믡궚��꺖�녈걬�뚣걼�ゃ깮�멥깉�ゃ겗�묆긿��겓�녈깞�쇈걮�얇걲��" #. type: Labeled list #: en/git-clone.txt:99 @@ -14425,7 +14413,7 @@ msgstr "--reference[-if-able] <repository>" #: en/git-clone.txt:109 #, priority:300 msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone." -msgstr "�귞뀱�ゃ깮�멥깉�ゃ걣��꺖�ャ꺂�욁궥�념툓�ャ걗�뗥졃�덀겘�곩뢿�㎯꺁�앫궦�덀꺁�뗣굢�ゃ깣�멥궒��깉�믣룚孃쀣걲�뗣굠�녴겓 `.git/objects/info/alternates` �믦눎�뺟쉪�ヨÞ若싥걮�얇걲�귝뿢耶섅겗�ゃ깮�멥깉�ゃ굮餓f쎘�ⓦ걮�╊슴�ⓦ걲�뗣겏�곥궚��꺖�녈굮鵝쒏닇�쇻굥�ゃ깮�멥깉�ゃ걢�됥궠�붵꺖�쇻굥恙낁쫨��걗�뗣궕�뽧궦�㎯궚�덀걣弱묆겒�뤵겒�듽�곥깓�껁깉��꺖��겏��꺖�ャ꺂��궧�덀꺃�쇈궦�녈궧�덀걣�딀툤�뺛굦�얇걲�� `--reference-if-able`�믢슴�ⓦ걲�뗣겏�곥궚��꺖�녈굮訝���쇻굥餓c굩�듽겓�곩춼�ⓦ걮�ゃ걚�뉎궍�с궚�덀꺁�뚣궧��긿�쀣걬�뚣�곮��듽걣烏①ㅊ�뺛굦�얇걲��" +msgstr "�귞뀱�ゃ깮�멥깉�ゃ걣��꺖�ャ꺂�욁궥�념툓�ャ걗�뗥졃�덀겘�곩뢿�㎯꺁�앫궦�덀꺁�뗣굢�ゃ깣�멥궒��깉�믣룚孃쀣걲�뗣굠�녴겓 `.git/objects/info/alternates` �믦눎�뺟쉪�ヨÞ若싥걮�얇걲�귝뿢耶섅겗�ゃ깮�멥깉�ゃ굮餓f쎘�ⓦ걮�╊슴�ⓦ걲�뗣겏�곥궚��꺖�녈굮鵝쒏닇�쇻굥�ゃ깮�멥깉�ゃ걢�됥궠�붵꺖�쇻굥恙낁쫨��걗�뗣궕�뽧궦�㎯궚�덀걣弱묆겒�뤵겒�듽�곥깓�껁깉��꺖��겏��꺖�ャ꺂��궧�덀꺃�쇈궦�녈궧�덀걣�딀툤�뺛굦�얇걲�� `--reference-if-able` �믢슴�ⓦ걲�뗣겏�곥궚��꺖�녈굮訝���쇻굥餓c굩�듽겓�곩춼�ⓦ걮�ゃ걚�뉎궍�с궚�덀꺁�뚣궧��긿�쀣걬�뚣�곮��듽걣烏①ㅊ�뺛굦�얇걲��" #. type: Plain text #: en/git-clone.txt:112 @@ -14433,9 +14421,7 @@ msgstr "�귞뀱�ゃ깮�멥깉�ゃ걣��꺖�ャ꺂�욁궥�념툓�ャ걗�뗥졃�덀겘�곩뢿 msgid "" "*NOTE*: see the NOTE for the `--shared` option, and also the\n" "`--dissociate` option.\n" -msgstr "" -"*力ⓩ꼷*: `--shared` �ゃ깤�룔깾�녈겗 力ⓩ꼷 �믣뢿�㎯걮�╉걦�졼걬�꾠��\n" -"�얇걼��`--dissociate`�ゃ깤�룔깾�녈굚�귞뀱�쀣겍�뤵걽�뺛걚��\n" +msgstr "*力ⓩ꼷*: `--shared` �ゃ깤�룔깾�녈겗 力ⓩ꼷 �믣뢿�㎯걮�╉걦�졼걬�꾠��\n�얇걼��`--dissociate` �ゃ깤�룔깾�녈굚�귞뀱�쀣겍�뤵걽�뺛걚��\n" #. type: Labeled list #: en/git-clone.txt:113 en/git-submodule.txt:403 @@ -14465,7 +14451,7 @@ msgstr "�쀩빓�ュ츪烏뚣걮�얇걲�귝쮽繹뽧궓�⒲꺖�밤깉�ゃ꺖�졼겦���꿱죱�� #: en/git-clone.txt:139 #, priority:300 msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag forces progress status even if the standard error stream is not directed to a terminal." -msgstr "與숁틬�ⓦ꺀�쇈궧�덀꺁�쇈깲�뚣궭�쇈깱�듽꺂�ユ렏泳싥걬�뚣겍�꾠굥�닷릦��`--quiet`�뚧뙁若싥걬�뚣겍�꾠겒�꾦솏�듽�곲�꿩뜔�뜻퀋��깈�뺛궔�ャ깉�㎪쮽繹뽧궓�⒲꺖�밤깉�ゃ꺖�졼겓�긷몜�뺛굦�얇걲�귙걪��깢�⒲궛���곫쮽繹뽧궓�⒲꺖�밤깉�ゃ꺖�졼걣�욍꺖�잆깏�ャ겓�묆걨�됥굦�╉걚�ゃ걚�닷릦�㎯굚�곲�꿱죱�뜻퀋�믣섭�띄쉪�ュ젿�듽걮�얇걲��" +msgstr "與숁틬�ⓦ꺀�쇈궧�덀꺁�쇈깲�뚣궭�쇈깱�듽꺂�ユ렏泳싥걬�뚣겍�꾠굥�닷릦��`--quiet` �뚧뙁若싥걬�뚣겍�꾠겒�꾦솏�듽�곲�꿩뜔�뜻퀋��깈�뺛궔�ャ깉�㎪쮽繹뽧궓�⒲꺖�밤깉�ゃ꺖�졼겓�긷몜�뺛굦�얇걲�귙걪��깢�⒲궛���곫쮽繹뽧궓�⒲꺖�밤깉�ゃ꺖�졼걣�욍꺖�잆깏�ャ겓�묆걨�됥굦�╉걚�ゃ걚�닷릦�㎯굚�곲�꿱죱�뜻퀋�믣섭�띄쉪�ュ젿�듽걮�얇걲��" #. type: Plain text #: en/git-clone.txt:151 @@ -14495,7 +14481,7 @@ msgstr "--bare" #: en/git-clone.txt:168 #, priority:300 msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created." -msgstr "�뚣깧�㏂�뛉it �ゃ깮�멥깉�ゃ굮鵝쒏닇�쀣겲�쇻�� �ㅳ겲�듽��`<directory>` �믢퐳�먦걮����녺뵪��깢�▲궎�ャ굮 `<directory>/.git` �ョ쉰�뤵겗�㎯겘�ゃ걦��`<directory>` �や퐪�� `$GIT_DIR` �ャ걲�뗣겗�㎯걲�귙걪�뚣겘�롢굢�뗣겓�곦퐳璵�깂�ゃ꺖�믡긽�㎯긿��궋�╉깉�쇻굥�닸��뚣겒�꾠걼�곥��`--no-checkout` �믤꼷�녈걮�얇걲�� �얇걼�곥꺁�㏂꺖�덀겗�뽧꺀�녈긽�섅긿�됥겘��`refs/remotes/origin/`�ャ깯�껁깞�녈궛�뺛굦�뗣걪�ⓦ겒�뤵�곩�恙쒌걲�뗣꺆�쇈궖�ャ겗�뽧꺀�녈긽�섅긿�됥겓�닸렏�녈깞�쇈걬�뚣겲�쇻�� �볝겗�ゃ깤�룔깾�녈굮鵝욜뵪�쇻굥�ⓦ�곥꺁�㏂꺖�덀깉�⒲긿��꺍�겹깣�⒲꺍�곥굚���c걲�뗨Þ若싧쨯�겹굚鵝쒏닇�뺛굦�얇걵�볝��" +msgstr "�뚣깧�㏂�뛉it �ゃ깮�멥깉�ゃ굮鵝쒏닇�쀣겲�쇻�� �ㅳ겲�듽��`<directory>` �믢퐳�먦걮����녺뵪��깢�▲궎�ャ굮 `<directory>/.git` �ョ쉰�뤵겗�㎯겘�ゃ걦��`<directory>` �や퐪�� `$GIT_DIR` �ャ걲�뗣겗�㎯걲�귙걪�뚣겘�롢굢�뗣겓�곦퐳璵�깂�ゃ꺖�믡긽�㎯긿��궋�╉깉�쇻굥�닸��뚣겒�꾠걼�곥��`--no-checkout` �믤꼷�녈걮�얇걲�� �얇걼�곥꺁�㏂꺖�덀겗�뽧꺀�녈긽�섅긿�됥겘��`refs/remotes/origin/` �ャ깯�껁깞�녈궛�뺛굦�뗣걪�ⓦ겒�뤵�곩�恙쒌걲�뗣꺆�쇈궖�ャ겗�뽧꺀�녈긽�섅긿�됥겓�닸렏�녈깞�쇈걬�뚣겲�쇻�� �볝겗�ゃ깤�룔깾�녈굮鵝욜뵪�쇻굥�ⓦ�곥꺁�㏂꺖�덀깉�⒲긿��꺍�겹깣�⒲꺍�곥굚���c걲�뗨Þ若싧쨯�겹굚鵝쒏닇�뺛굦�얇걵�볝��" #. type: Plain text #: en/git-clone.txt:174 @@ -14513,7 +14499,7 @@ msgstr "--filter=<filter-spec>" #: en/git-clone.txt:184 #, priority:300 msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]." -msgstr "�묆꺖�룔깵�ャ궚��꺖�녔찣�썬굮鵝욍겂�╉�곦툗�덀굢�뚣걼�ゃ깣�멥궒��깉�삠깢�c꺂�욍겓�쀣걼�뚣겂�╉�곩댆�붷룾�썬겒�ゃ깣�멥궒��깉��궢�뽧궩�껁깉�믧�곥굥�덀걝�ャ궢�쇈깘�ヨ쫨黎귙걮�얇걲�� `--filter` �믢슴�녶졃�덀�곥깙�쇈궥�c꺂��꺆�쇈꺍��깢�c꺂�욍겓���곦툗�덀굢�뚣걼`<filter-spec>`�뚥슴�뤵굦�얇걲�귙걼�ⓦ걟�겹�� `--filter=blob:none` �ⓦ걲�뗣겏�갍it�뚦퓚誤곥겏�쇻굥�얇겎�곥걲�밤겍�췣lob竊덀깢�▲궎�ャ겗�끻�竊됥굮�뺛궍�ャ궭�ゃ꺍�겹걮�얇걲�귙겲�잆�� `--filter=blob:limit=<size>` �ⓦ걲�뗣겏�곩컩�ゃ걦�ⓦ굚`<size>`餓δ툓��궢�ㅳ궨�췣lob�믡걲�밤겍�뺛궍�ャ궭�ゃ꺍�겹걮�얇걲�귙깢�c꺂�욍꺖��퍞礪섅겓�ㅳ걚�╉겗屋녕눗���� linkgit:git-rev-list[1] �� `--filter` �ゃ깤�룔깾�녈굮�귞뀱�쀣겍�뤵걽�뺛걚��" +msgstr "�묆꺖�룔깵�ャ궚��꺖�녔찣�썬굮鵝욍겂�╉�곦툗�덀굢�뚣걼�ゃ깣�멥궒��깉�삠깢�c꺂�욍겓�쀣걼�뚣겂�╉�곩댆�붷룾�썬겒�ゃ깣�멥궒��깉��궢�뽧궩�껁깉�믧�곥굥�덀걝�ャ궢�쇈깘�ヨ쫨黎귙걮�얇걲�� `--filter` �믢슴�녶졃�덀�곥깙�쇈궥�c꺂��꺆�쇈꺍��깢�c꺂�욍겓���곦툗�덀굢�뚣걼 `<filter-spec>` �뚥슴�뤵굦�얇걲�귙걼�ⓦ걟�겹�� `--filter=blob:none` �ⓦ걲�뗣겏�갍it�뚦퓚誤곥겏�쇻굥�얇겎�곥걲�밤겍�췣lob竊덀깢�▲궎�ャ겗�끻�竊됥굮�뺛궍�ャ궭�ゃ꺍�겹걮�얇걲�귙겲�잆�� `--filter=blob:limit=<size>` �ⓦ걲�뗣겏�곩컩�ゃ걦�ⓦ굚 `<size>` 餓δ툓��궢�ㅳ궨�췣lob�믡걲�밤겍�뺛궍�ャ궭�ゃ꺍�겹걮�얇걲�귙깢�c꺂�욍꺖��퍞礪섅겓�ㅳ걚�╉겗屋녕눗���� linkgit:git-rev-list[1] �� `--filter` �ゃ깤�룔깾�녈굮�귞뀱�쀣겍�뤵걽�뺛걚��" #. type: Labeled list #: en/git-clone.txt:185 en/git-push.txt:161 @@ -14525,7 +14511,7 @@ msgstr "--mirror" #: en/git-clone.txt:192 #, priority:300 msgid "Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository." -msgstr "�썬꺖�밤꺁�앫궦�덀꺁��깱�⒲꺖�믦Þ若싥걮�얇걲�귙걪�뚣겘 `--bare`�믤꼷�녈걮�얇걲�� `--bare`�ⓩ캈雍껁걮�╉��` --mirror`���곥궫�쇈궧��꺆�쇈궖�ャ깣�⒲꺍�곥굮�욍꺖�꿔긿�덀겗��꺖�ャ꺂�뽧꺀�녈긽�ャ깯�껁깤�쇻굥�졼걨�㎯겒�뤵�곥걲�밤겍��뢿�㏆펷�ゃ깴�쇈깉�덀꺀�껁궘�녈궛�뽧꺀�녈긽�곥깳�㏂겒�⒲굮�ャ�竊됥굮�욁긿�쀣걮�곥궭�쇈궟�껁깉�ゃ깮�멥깉�ゃ겗`git remote update`�ャ굠�c겍�볝굦�됥겗ref�뚣걲�밤겍訝딀쎑�띲걬�뚣굥�덀걝�쳑efspec��Þ若싥굮烏뚣걚�얇걲��" +msgstr "�썬꺖�밤꺁�앫궦�덀꺁��깱�⒲꺖�믦Þ若싥걮�얇걲�귙걪�뚣겘 `--bare` �믤꼷�녈걮�얇걲�� `--bare` �ⓩ캈雍껁걮�╉�� ` --mirror` ���곥궫�쇈궧��꺆�쇈궖�ャ깣�⒲꺍�곥굮�욍꺖�꿔긿�덀겗��꺖�ャ꺂�뽧꺀�녈긽�ャ깯�껁깤�쇻굥�졼걨�㎯겒�뤵�곥걲�밤겍��뢿�㏆펷�ゃ깴�쇈깉�덀꺀�껁궘�녈궛�뽧꺀�녈긽�곥깳�㏂겒�⒲굮�ャ�竊됥굮�욁긿�쀣걮�곥궭�쇈궟�껁깉�ゃ깮�멥깉�ゃ겗 `git remote update` �ャ굠�c겍�볝굦�됥겗ref�뚣걲�밤겍訝딀쎑�띲걬�뚣굥�덀걝�쳑efspec��Þ若싥굮烏뚣걚�얇걲��" #. type: Labeled list #: en/git-clone.txt:193 @@ -14543,7 +14529,7 @@ msgstr "--origin <name>" #: en/git-clone.txt:198 #, priority:300 msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`. Overrides `clone.defaultRemoteName` from the config." -msgstr "訝딀탛��꺁�앫궦�덀꺁�믦옙瓮▲걲�뗣걼�곥겓�ゃ깴�쇈깉�� `origin` �믢슴�ⓦ걲�뗤빰�뤵굤�ャ��`<name>` �믢슴�ⓦ걮�얇걲�� �녈꺍�뺛궍�겹겗 `clone.defaultRemoteName` �믡궕�쇈깘�쇈꺀�ㅳ깋�쀣겲�쇻��" +msgstr "訝딀탛��꺁�앫궦�덀꺁�믦옙瓮▲걲�뗣걼�곥겓�ゃ깴�쇈깉�� `origin` �믢슴�ⓦ걲�뗤빰�뤵굤�ャ�� `<name>` �믢슴�ⓦ걮�얇걲�� �녈꺍�뺛궍�겹겗 `clone.defaultRemoteName` �믡궕�쇈깘�쇈꺀�ㅳ깋�쀣겲�쇻��" #. type: Labeled list #: en/git-clone.txt:199 @@ -14621,7 +14607,7 @@ msgstr "--depth <depth>" #: en/git-clone.txt:241 #, priority:300 msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`." -msgstr "�뉐츣�뺛굦�잍빊��궠�잆긿�덀겓�뉎굤屋겹굙�됥굦�잆깚�밤깉�ゃ꺖�믤똻�ㅳ�곥�뚧탢�꾠�띲궚��꺖�녈굮鵝쒏닇�쀣겲�쇻��`--no-single-branch` �뚧뙁若싥걬�뚣겍�꾠겒�꾦솏�듽��`--single-branch` �믤꼷�녈걮�곥걲�밤겍��깣�⒲꺍�곥겗�덄ク餓섋퓩��괘閭담굮�뽩풓�쀣겲�쇻�귙궢�뽧깴�멥깷�쇈꺂�믤탢�뤵궚��꺖�녈걮�잆걚�닷릦�ャ겘��`--shallow-submodules`�귝뙁若싥걮�╉걦�졼걬�꾠��" +msgstr "�뉐츣�뺛굦�잍빊��궠�잆긿�덀겓�뉎굤屋겹굙�됥굦�잆깚�밤깉�ゃ꺖�믤똻�ㅳ�곥�뚧탢�꾠�띲궚��꺖�녈굮鵝쒏닇�쀣겲�쇻�� `--no-single-branch` �뚧뙁若싥걬�뚣겍�꾠겒�꾦솏�듽��`--single-branch` �믤꼷�녈걮�곥걲�밤겍��깣�⒲꺍�곥겗�덄ク餓섋퓩��괘閭담굮�뽩풓�쀣겲�쇻�귙궢�뽧깴�멥깷�쇈꺂�믤탢�뤵궚��꺖�녈걮�잆걚�닷릦�ャ겘��`--shallow-submodules` �귝뙁若싥걮�╉걦�졼걬�꾠��" #. type: Plain text #: en/git-clone.txt:244 @@ -14645,7 +14631,7 @@ msgstr "--[no-]single-branch" #: en/git-clone.txt:259 #, priority:300 msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created." -msgstr "`--branch`�ゃ깤�룔깾�녈겎�뉐츣�뺛굦�잆깣�⒲꺍�곥�곥겲�잆겘�ゃ깴�쇈깉��`HEAD`�뚧뙁�쀧ㅊ�쇻깤�⒲궎�욁꺁�뽧꺀�녈긽��뀍塋�겓�녈굥�얇겎��괘閭담겗�욍굮��꺆�쇈꺍�쀣겲�쇻�� 永먩옖�ⓦ걮��풓�됥굦�뗣꺁�앫궦�덀꺁�믡걬�됥겓�뺛궒�껁긽�쇻굥�ⓦ�곫��앫겗��꺆�쇈꺍鵝쒏닇�귙겓�볝겗�ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�잆깣�⒲꺍�곥겗�ゃ깴�쇈깉�덀꺀�껁궘�녈궛�뽧꺀�녈긽��겳�뚧쎍�겹걬�뚣겲�쇻�� `--single-branch` ��꺆�쇈꺍�믢퐳�먦걮�잆겏�띲겓�곥꺁�㏂꺖�덀겗 HEAD �뚣겑��깣�⒲꺍�곥굚�뉎걮�╉걚�ゃ걢�c걼�닷릦���곥꺁�㏂꺖�덀깉�⒲긿��꺍�겹깣�⒲꺍�곥겘鵝쒏닇�뺛굦�얇걵�볝��" +msgstr "`--branch` �ゃ깤�룔깾�녈겎�뉐츣�뺛굦�잆깣�⒲꺍�곥�곥겲�잆겘�ゃ깴�쇈깉�� `HEAD` �뚧뙁�쀧ㅊ�쇻깤�⒲궎�욁꺁�뽧꺀�녈긽��뀍塋�겓�녈굥�얇겎��괘閭담겗�욍굮��꺆�쇈꺍�쀣겲�쇻�� 永먩옖�ⓦ걮��풓�됥굦�뗣꺁�앫궦�덀꺁�믡걬�됥겓�뺛궒�껁긽�쇻굥�ⓦ�곫��앫겗��꺆�쇈꺍鵝쒏닇�귙겓�볝겗�ゃ깤�룔깾�녈걣鵝욜뵪�뺛굦�잆깣�⒲꺍�곥겗�ゃ깴�쇈깉�덀꺀�껁궘�녈궛�뽧꺀�녈긽��겳�뚧쎍�겹걬�뚣겲�쇻�� `--single-branch` ��꺆�쇈꺍�믢퐳�먦걮�잆겏�띲겓�곥꺁�㏂꺖�덀겗 HEAD �뚣겑��깣�⒲꺍�곥굚�뉎걮�╉걚�ゃ걢�c걼�닷릦���곥꺁�㏂꺖�덀깉�⒲긿��꺍�겹깣�⒲꺍�곥겘鵝쒏닇�뺛굦�얇걵�볝��" #. type: Plain text #: en/git-clone.txt:266 @@ -14699,7 +14685,7 @@ msgstr "--[no-]remote-submodules" #: en/git-clone.txt:296 #, priority:300 msgid "All submodules which are cloned will use the status of the submodule's remote-tracking branch to update the submodule, rather than the superproject's recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`." -msgstr "��꺆�쇈꺍�뺛굦�잆걲�밤겍��궢�뽧깴�멥깷�쇈꺂���곥궢�뽧깴�멥깷�쇈꺂�믤쎍�겹걲�뗩슋�ャ�곮┴�쀣꺆�멥궒��깉�㎬쮼�꿔걬�뚣걼 SHA-1 �㎯겘�ゃ걦�곥궢�뽧깴�멥깷�쇈꺂��꺁�㏂꺖�덅옙瓮▲깣�⒲꺍�곥겗�뜻뀑�믢슴�ⓦ걮�얇걲��`git submodule update` �� `--remote` �믤륫�쇻겗�ⓨ릪�섅겎�쇻��" +msgstr "��꺆�쇈꺍�뺛굦�잆걲�밤겍��궢�뽧깴�멥깷�쇈꺂���곥궢�뽧깴�멥깷�쇈꺂�믤쎍�겹걲�뗩슋�ャ�곮┴�쀣꺆�멥궒��깉�㎬쮼�꿔걬�뚣걼 SHA-1 �㎯겘�ゃ걦�곥궢�뽧깴�멥깷�쇈꺂��꺁�㏂꺖�덅옙瓮▲깣�⒲꺍�곥겗�뜻뀑�믢슴�ⓦ걮�얇걲�� `git submodule update` �� `--remote` �믤륫�쇻겗�ⓨ릪�섅겎�쇻��" #. type: Labeled list #: en/git-clone.txt:297 en/git-init.txt:65 @@ -15443,7 +15429,7 @@ msgstr "�뉐츣�뺛굦�� <msg> �믡궠�잆긿�덀깳�껁궩�쇈궦�ⓦ걮�╊슴�ⓦ걮 #: en/git-commit.txt:189 #, priority:280 msgid "The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`." -msgstr "`m`�ゃ깤�룔깾�녈겘��`-c`��`-C`��`-F` �ⓦ겘�멧틨�ユ럲餓뽫쉪�㎯걲��" +msgstr "`m` �ゃ깤�룔깾�녈겘��`-c`��`-C`��`-F` �ⓦ겘�멧틨�ユ럲餓뽫쉪�㎯걲��" #. type: Labeled list #: en/git-commit.txt:190 @@ -30409,7 +30395,7 @@ msgstr "�ⓦ꺀�쇈겏鈺�몜��깳�껁궩�쇈궦��겳�믣눣�쎼걮�곥걹��퍟��눣 #: en/git-init.txt:52 #, priority:300 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory." -msgstr "�쇻궋�ゃ깮�멥깉�ゃ굮鵝쒏닇�쀣겲�쇻��`GIT_DIR`�겼쥊�뚩Þ若싥걬�뚣겍�꾠겒�꾢졃�덀겘�곭뤎�ⓦ겗鵝쒏��뉎궍�с궚�덀꺁�ヨÞ若싥걬�뚣겲�쇻��" +msgstr "�쇻궋�ゃ깮�멥깉�ゃ굮鵝쒏닇�쀣겲�쇻�� `GIT_DIR` �겼쥊�뚩Þ若싥걬�뚣겍�꾠겒�꾢졃�덀겘�곭뤎�ⓦ겗鵝쒏��뉎궍�с궚�덀꺁�ヨÞ若싥걬�뚣겲�쇻��" #. type: Labeled list #: en/git-init.txt:53 @@ -30487,7 +30473,7 @@ msgstr "'umask' (or 'false')" #: en/git-init.txt:99 #, priority:300 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified." -msgstr "umask(2)�㎩젿�듽걬�뚣걼�묆꺖�잆긿�룔깾�녈굮鵝욜뵪�쀣겲�쇻��`--shared`�뚧뙁若싥걬�뚣겍�꾠겒�꾢졃�덀겗�앮쐿鼇�츣�㎯걲��" +msgstr "umask(2)�㎩젿�듽걬�뚣걼�묆꺖�잆긿�룔깾�녈굮鵝욜뵪�쀣겲�쇻�� `--shared` �뚧뙁若싥걬�뚣겍�꾠겒�꾢졃�덀겗�앮쐿鼇�츣�㎯걲��" #. type: Labeled list #: en/git-init.txt:100 @@ -30547,7 +30533,7 @@ msgstr "�녴꺍�쀣꺃�쇈깉�뉎궍�с궚�덀꺁" #: en/git-init.txt:134 #, priority:300 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created." -msgstr "�녴꺍�쀣꺃�쇈깉�뉎궍�с궚�덀꺁�끹겗�뺛궊�ㅳ꺂�꾠깈�c꺃��깉�ゃ겗�녴걾�곩릫�띲걣�됥긿�덀겎冶뗣겲�됥겒�꾠굚��겘��`$GIT_DIR`��퐳�먨풄�ャ궠�붵꺖�뺛굦�얇걲��" +msgstr "�녴꺍�쀣꺃�쇈깉�뉎궍�с궚�덀꺁�끹겗�뺛궊�ㅳ꺂�꾠깈�c꺃��깉�ゃ겗�녴걾�곩릫�띲걣�됥긿�덀겎冶뗣겲�됥겒�꾠굚��겘��`$GIT_DIR` ��퐳�먨풄�ャ궠�붵꺖�뺛굦�얇걲��" #. type: Plain text #: en/git-init.txt:136 @@ -30559,19 +30545,19 @@ msgstr "�녴꺍�쀣꺃�쇈깉�뉎궍�с궚�덀꺁���곦빳訝뗣겗�꾠걳�뚣걢�ャ겒�� #: en/git-init.txt:138 #, priority:300 msgid "the argument given with the `--template` option;" -msgstr "`--template`�ゃ깤�룔깾�녈겎�뉐츣�뺛굦�잌폊�겹��" +msgstr "`--template` �ゃ깤�룔깾�녈겎�뉐츣�뺛굦�잌폊�겹��" #. type: Plain text #: en/git-init.txt:140 #, priority:300 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;" -msgstr "`$ GIT_TEMPLATE_DIR`�겼쥊鸚됪빊��냵若밤��" +msgstr "`$GIT_TEMPLATE_DIR` �겼쥊鸚됪빊��냵若밤��" #. type: Plain text #: en/git-init.txt:142 #, priority:300 msgid "the `init.templateDir` configuration variable; or" -msgstr "`init.templateDir`礪뗦닇鸚됪빊�귙겲�잆겘" +msgstr "`init.templateDir` 礪뗦닇鸚됪빊��" #. type: Plain text #: en/git-init.txt:144 @@ -65341,7 +65327,7 @@ msgstr "<transport>::<address>" #: en/urls.txt:69 #, priority:300 msgid "where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See linkgit:gitremote-helpers[7] for details." -msgstr "�볝걪�� <address> �ャ겘�곥깙�밤�곥궢�쇈깘�쇈겏�묆궧�곥걗�뗣걚��돈�뺛걲�뗣꺁�㏂꺖�덀깦�ャ깙�쇈걣沃띹춼�쇻굥餓삥꼷�� URL �⒲궎��겒�뉐춻�쀣굮�뉐츣�쀣겲�쇻�귟㈂榮겹겘 linkgit:gitremote-helpers[7] �믣뢿�㎯걦�졼걬�꾠��" +msgstr "�볝걪�� <address> �ャ겘�곥깙�밤�곥궢�쇈깘�쇈겏�묆궧�곥걗�뗣걚��돈�뺛걲�뗣꺁�㏂꺖�덀깦�ャ깙�쇈걣沃띹춼�쇻굥餓삥꼷�� URL �⒲궎��겒�뉐춻�쀣굮�뉐츣�쀣겲�쇻�귟㈂榮겹겘 linkgit:gitremote-helpers[7] �믣뢿�㎯걮�╉걦�졼걬�꾠��" #. type: Plain text #: en/urls.txt:74 diff --git a/po/documentation.ro.po b/po/documentation.ro.po index c740b7be343b1caabd65394d601e292e87438aff..d63cc57af91aecb380ff2438a03eabe94932a0b4 100644 --- a/po/documentation.ro.po +++ b/po/documentation.ro.po @@ -4,19 +4,7 @@ # Jean-No챘l Avila <jn.avila@free.fr>, 2021. # msgid "" -msgstr "" -"Project-Id-Version: git-manpages-l 10n\n" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-10-31 17:03+0100\n" -"PO-Revision-Date: 2021-08-31 21:13+0000\n" -"Last-Translator: Simona Iacob <s@zp1.net>\n" -"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" -"Language: ro\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" -"X-Generator: Weblate 4.8.1-dev\n" +msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2022-01-07 19:14+0000\nLast-Translator: Simona Iacob <s@zp1.net>\nLanguage-Team: Romanian <translation-team-ro@lists.sourceforge.net>\nLanguage: ro\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\nX-Generator: Weblate 4.10.1\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31 @@ -6454,7 +6442,7 @@ msgstr "--sparse" #: en/git-add.txt:88 #, priority:300 msgid "Allow updating index entries outside of the sparse-checkout cone. Normally, `git add` refuses to update index entries whose paths do not fit within the sparse-checkout cone, since those files might be removed from the working tree without warning. See linkgit:git-sparse-checkout[1] for more details." -msgstr "" +msgstr "Permite actualizarea intr훱rilor din index 챤n afara conului de verificare a sparse-checkout. 횓n mod normal, `git add` refuz훱 s훱 actualizeze intr훱rile de index ale c훱ror c훱i de acces nu se 챤ncadreaz훱 챤n conul sparse-checkout, deoarece aceste fi�iere ar putea fi eliminate din arborele de lucru f훱r훱 avertisment. Vezi linkgit:git-sparse-checkout[1] pentru mai multe detalii." #. type: Labeled list #: en/git-add.txt:89 en/git-am.txt:131 en/git-branch.txt:150 en/git-clean.txt:44 en/git-commit.txt:300 en/git-cvsimport.txt:88 en/git-grep.txt:81 en/git-help.txt:65 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:501 en/git-repack.txt:166 en/git-tag.txt:130 en/rev-list-options.txt:73 diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 14a90bc74892d94b092e1cf173f9d096268dce2a..0c21973902a5f52b84b78a4421802fff559f294e 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -3,19 +3,7 @@ # This file is distributed under the same license as the Git package. # Matthias A횩hauer <mha1993@live.de>, 2019. msgid "" -msgstr "" -"Project-Id-Version: git documentation\n" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-10-31 17:03+0100\n" -"PO-Revision-Date: 2021-10-02 15:39+0000\n" -"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_HANS-CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.9-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2021-11-23 15:35+0000\nLast-Translator: 凉졾ㄹ壅� <472546172@qq.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.10-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31 @@ -403,9 +391,9 @@ msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 -#, fuzzy, priority:100 +#, priority:100 msgid "Display help information about Git." -msgstr " Git " +msgstr "�양ㅊ�됧뀽Git�꾢리�⒳에����" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 @@ -415,9 +403,9 @@ msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 -#, fuzzy, priority:100 +#, priority:100 msgid "Instantly browse your working repository in gitweb." -msgstr " gitweb " +msgstr "�쮏itweb訝�탲鰲덃궓�꾢램鵝쒎춼�ⓨ틩��" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 @@ -463,9 +451,9 @@ msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 -#, fuzzy, priority:100 +#, priority:100 msgid "Check the GPG signature of commits." -msgstr " GPG " +msgstr "汝��ζ룓雅ㅷ쉪GPG嶺얍릫��" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 @@ -475,9 +463,9 @@ msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 -#, fuzzy, priority:100 +#, priority:100 msgid "Check the GPG signature of tags." -msgstr " GPG " +msgstr "汝��쩿ag�껯PG嶺얍릫��" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:40 @@ -595,9 +583,9 @@ msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 -#, fuzzy, priority:100 +#, priority:100 msgid "Manage reflog information." -msgstr " reflog " +msgstr "嶸←릤reflog岳→겘��" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 @@ -643,9 +631,9 @@ msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Import a GNU Arch repository into Git." -msgstr " GNU Arch Git" +msgstr "野쇔뀯訝�訝찱NU Arch餓볟틩�캢it��" #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 @@ -655,9 +643,9 @@ msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 -#, fuzzy, priority:100 +#, priority:100 msgid "Export a single commit to a CVS checkout." -msgstr " CVS " +msgstr "野쇔눣�뺞Аcommit�캜VS checkout��" #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 @@ -679,9 +667,9 @@ msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "A CVS server emulator for Git." -msgstr "Git CVS " +msgstr "�ⓧ틢Git�껩VS�띶뒦�ⓩÆ�잌솳��" #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 @@ -703,9 +691,9 @@ msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 -#, fuzzy, priority:100 +#, priority:100 msgid "Import from and submit to Perforce repositories." -msgstr " Perforce " +msgstr "餓� Perforce 耶섇궓佯볟��ε뭽�먧벡��" #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 @@ -715,9 +703,9 @@ msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 -#, fuzzy, priority:100 +#, priority:100 msgid "Applies a quilt patchset onto the current branch." -msgstr " quilt " +msgstr "弱� quilt 烏δ툈�녶틪�ⓨ댆壤볟뎺�녷뵱" #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 @@ -979,9 +967,9 @@ msgstr "linkgit:gittutorial[7]" #. type: Plain text #: en/cmds-guide.txt:57 -#, fuzzy, priority:100 +#, priority:100 msgid "A tutorial introduction to Git." -msgstr " Git " +msgstr "Git�ι뿨�숂쮮��" #. type: Labeled list #: en/cmds-guide.txt:58 @@ -1051,9 +1039,9 @@ msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "Use binary search to find the commit that introduced a bug." -msgstr " bug " +msgstr "鵝욜뵪雅뚩퓵�뜻맂榮€윥�얍폊�ι뵗瑥�쉪�먧벡��" #. type: Labeled list #: en/cmds-mainporcelain.txt:13 @@ -1231,9 +1219,9 @@ msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 -#, fuzzy, priority:100 +#, priority:100 msgid "A portable graphical interface to Git." -msgstr " Git " +msgstr "Git�꾢룾燁삥쨳�얍숱�뚪씊��" #. type: Labeled list #: en/cmds-mainporcelain.txt:58 @@ -1267,9 +1255,9 @@ msgstr "linkgit:git-maintenance[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:66 -#, fuzzy, priority:100 +#, priority:100 msgid "Run tasks to optimize Git repository data." -msgstr " HTTP Git " +msgstr "瓦먫죱餓삣뒦�δ폍�뺾it耶섇궓佯볡쉪�경뜮��" #. type: Plain text #: en/cmds-mainporcelain.txt:67 en/git-fmt-merge-msg.txt:75 @@ -1363,9 +1351,9 @@ msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 -#, fuzzy, priority:100 +#, priority:100 msgid "Reset current HEAD to the specified state." -msgstr " HEAD " +msgstr "�띸쉰壤볟뎺HEAD�경뙁若싩듁�곥��" #. type: Labeled list #: en/cmds-mainporcelain.txt:91 @@ -1615,9 +1603,9 @@ msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 -#, fuzzy, priority:100 +#, priority:100 msgid "Extract commit ID from an archive created using git-archive." -msgstr " git-archive ID" +msgstr "餓롣슴�쮏it archive�쎾뻠�꾢춼旅d릎�먨룚commit ID��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 @@ -1673,8 +1661,8 @@ msgstr "" msgid "linkgit:git-name-rev[1]" msgstr "linkgit:git-name-rev[1]" -#. type: Plain text # �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁� +#. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 #, priority:100 msgid "Find symbolic names for given revs." @@ -1748,9 +1736,9 @@ msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:57 -#, fuzzy, priority:100 +#, priority:100 msgid "Creates a temporary file with a blob's contents." -msgstr " blob " +msgstr "�쎾뻠�끻맜blob�끻��꾡릿�뜻뻼餓뜰��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:58 @@ -1808,9 +1796,9 @@ msgstr "linkgit:git-commit-graph[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 -#, fuzzy, priority:100 +#, priority:100 msgid "Write and verify Git commit-graph files." -msgstr " Git " +msgstr "煐뽩넍亮띌챿瑥갍it commit-graph�뉏뻑��" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 @@ -2012,9 +2000,9 @@ msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Display gitattributes information." -msgstr " gitattributes " +msgstr "�양ㅊ掠욄�㏛에����" #. type: Labeled list #: en/cmds-purehelpers.txt:4 @@ -2024,9 +2012,9 @@ msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 -#, fuzzy, priority:100 +#, priority:100 msgid "Debug gitignore / exclude files." -msgstr " gitignore / exclude " +msgstr "瘟껇캊gitignore/�믧솮�뉏뻑��" #. type: Labeled list #: en/cmds-purehelpers.txt:7 @@ -2144,9 +2132,9 @@ msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 -#, fuzzy, priority:100 +#, priority:100 msgid "Simple UNIX mbox splitter program." -msgstr " UNIX mbox " +msgstr "嶸��뺟쉪 UNIX mbox �녶늽�①쮮佯뤵��" #. type: Labeled list #: en/cmds-purehelpers.txt:37 @@ -2156,9 +2144,9 @@ msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 -#, fuzzy, priority:100 +#, priority:100 msgid "The standard helper program to use with git-merge-index." -msgstr " git-merge-index " +msgstr "訝럊it-merge-index訝�壅룝슴�①쉪�뉐뇛躍�뒰葉뗥틣��" #. type: Plain text #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142 @@ -2168,9 +2156,9 @@ msgstr "linkgit:git-patch-id[1]" #. type: Plain text #: en/cmds-purehelpers.txt:42 -#, fuzzy, priority:100 +#, priority:100 msgid "Compute unique ID for a patch." -msgstr " ID" +msgstr "訝븃‥訝곮�嶸쀥뵱訝��꾡말�췏D��" #. type: Labeled list #: en/cmds-purehelpers.txt:43 @@ -2180,9 +2168,9 @@ msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 -#, fuzzy, priority:100 +#, priority:100 msgid "Git's i18n setup code for shell scripts." -msgstr " shell Git " +msgstr "Git�꼒18n(�썽솀��)若됭즳餓g쟻- shell�싨쑍." #. type: Labeled list #: en/cmds-purehelpers.txt:46 @@ -2192,9 +2180,9 @@ msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 -#, fuzzy, priority:100 +#, priority:100 msgid "Common Git shell script setup code." -msgstr " Git shell " +msgstr "�싩뵪Git shell�싨쑍若됭즳餓g쟻��" #. type: Labeled list #: en/cmds-purehelpers.txt:49 @@ -2216,9 +2204,9 @@ msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Download from a remote Git repository via HTTP." -msgstr " HTTP Git " +msgstr "�싪퓝HTTP餓롨퓶葉딦it耶섇궓佯볞툔饔썬��" #. type: Labeled list #: en/cmds-synchelpers.txt:4 @@ -2228,9 +2216,9 @@ msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 -#, fuzzy, priority:100 +#, priority:100 msgid "Push objects over HTTP/DAV to another repository." -msgstr " HTTP/DAV " +msgstr "�싪퓝HTTP/DAV弱녶�穩→렓�곩댆�╊�訝ゅ춼�ⓨ틩��" #. type: Labeled list #: en/cmds-synchelpers.txt:7 @@ -2252,9 +2240,9 @@ msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "Restricted login shell for Git-only SSH access." -msgstr " Git SSH shell" +msgstr "Git-only SSH �싮걪鵝욜뵪�꾦솏�띄쇉壤뺠꽊�с��" #. type: Labeled list #: en/cmds-synchelpers.txt:13 @@ -2264,9 +2252,9 @@ msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 -#, fuzzy, priority:100 +#, priority:100 msgid "Send archive back to git-archive." -msgstr " git-archive" +msgstr "弱녶퐩旅f뻼餓뜹룕�곩썮git-archive��" #. type: Labeled list #: en/cmds-synchelpers.txt:16 @@ -2276,9 +2264,9 @@ msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 -#, fuzzy, priority:100 +#, priority:100 msgid "Send objects packed back to git-fetch-pack." -msgstr " git-fetch-pack" +msgstr "弱녷돀�끿쉪野배괌�묌�곩썮git-fetch-pack��" #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 @@ -2288,9 +2276,9 @@ msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "A really simple server for Git repositories." -msgstr " Git " +msgstr "訝�訝ら씆躍며��뺟쉪Git耶섇궓佯볠쐨�▼솳��" #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 @@ -2324,9 +2312,9 @@ msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "Push objects over Git protocol to another repository." -msgstr " Git " +msgstr "�싪퓝Git�뤺�弱녶�穩→렓�곩댆�╊�訝ゅ춼�ⓨ틩��" #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 @@ -3154,7 +3142,7 @@ msgstr "瓦쇾틳�썰빱�썸캈渦껂륵瀯꾡틟�⒲�귚퐜驪붻푵�꾢냵若방쐣��訝띶릪竊�" #. type: Labeled list #: en/diff-format.txt:10 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "git-diff-index <tree-ish>" msgstr "git-diff-index <tree-ish>" @@ -3166,7 +3154,7 @@ msgstr "驪붻푵 <�뉏뻑��> �뚧뻼餓띄내瀯잋툓�꾣뻼餓뜰��" #. type: Labeled list #: en/diff-format.txt:13 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "git-diff-index --cached <tree-ish>" msgstr "git-diff-index --cached <tree-ish>" @@ -3178,7 +3166,7 @@ msgstr "驪붻푵 <�뉏뻑��> �뚨뇨凉뺛��" #. type: Labeled list #: en/diff-format.txt:16 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]" msgstr "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]" @@ -3190,7 +3178,7 @@ msgstr "驪붻푵�긴륵訝ゅ뢿�겻폖�믥쉪�뉏뻑�묆��" #. type: Labeled list #: en/diff-format.txt:19 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "git-diff-files [<pattern>...]" msgstr "git-diff-files [<pattern>...]" @@ -3542,9 +3530,9 @@ msgstr "�띈〃寧�폑" #. type: Plain text #: en/diff-format.txt:158 en/diff-format.txt:174 -#, fuzzy, priority:280 +#, priority:280 msgid "the number of deleted lines;" -msgstr "藥꿨닠�ㅸ죱��;" +msgstr "藥꿨닠�ㅷ쉪烏뚧빊;" #. type: Plain text #: en/diff-format.txt:160 @@ -3600,7 +3588,7 @@ msgstr "若뚧빐瓮�푶�랃펷餓끻쑉�띶뫝��/鸚띶댍�뜹춼�⑨펹竊�" #. type: Plain text #: en/diff-format.txt:180 -#, fuzzy, priority:280 +#, priority:280 msgid "a NUL." msgstr "a NUL." @@ -5707,9 +5695,9 @@ msgstr "--dst-prefix=<prefix>" #. type: Plain text #: en/diff-options.txt:836 -#, fuzzy, priority:280 +#, priority:280 msgid "Show the given destination prefix instead of \"b/\"." -msgstr " \"b/\"" +msgstr "�양ㅊ瀯쇿츣�꾤쎅�뉐뎺煐�竊뚩�뚥툖���쐀/�앫��" #. type: Labeled list #: en/diff-options.txt:837 @@ -7037,8 +7025,8 @@ msgstr "�좈솮�꾢냵若�" msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)." msgstr "�좈솮�꾢냵若밥빳��-�앭�鸚당쉪烏뚩〃鹽뷩�귝궓��빳�싪퓝弱녳��-�앲쉬�㏘맏�� �앾펷令뷸졏竊됪씎�꿩�弱녶끀�좈솮��" -#. type: Labeled list # 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻 +#. type: Labeled list #: en/git-add.txt:386 #, fuzzy, no-wrap, priority:300 msgid "modified content" @@ -8711,9 +8699,9 @@ msgstr "git-bisect(1)" #. type: Plain text #: en/git-bisect.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-bisect - Use binary search to find the commit that introduced a bug" -msgstr " bug " +msgstr "git-bisect - 鵝욜뵪雅뚩퓵�뜻맂榮€윥�얍폊�ι뵗瑥�쉪�먧벡��" #. type: Plain text #: en/git-bisect.txt:13 @@ -15497,19 +15485,19 @@ msgstr "誤곫돽瑥븀쉪�끻���빳�ⓨ뇿燁띷뼶凉뤸뙁若싥��" #: en/git-commit.txt:34 #, priority:280 msgid "by using linkgit:git-add[1] to incrementally \"add\" changes to the index before using the 'commit' command (Note: even modified files must be \"added\");" -msgstr "�싪퓝鵝욜뵪linkgit:git-add[1]竊뚦쑉鵝욜뵪'commit'�썰빱阿뗥뎺竊뚪�먩�弱녵엶�밧냵若� \"曆삣뒥 \"�곁뇨凉뺜릎竊덃낏�륅폏�념슴��엶�배퓝�꾣뻼餓뜸튋恙낂』熬� \"曆삣뒥\"竊됥��" +msgstr "�싪퓝鵝욜뵪linkgit:git-add[1]竊뚦쑉鵝욜뵪'commit'�썰빱阿뗥뎺竊뚪�먩�弱녵엶�밧냵若� \"曆삣뒥 \"�곁뇨凉뺜릎竊덃낏��:�념슴��엶�배퓝�꾣뻼餓뜸튋恙낂』熬� \"曆삣뒥\"竊됥��" #. type: Plain text #: en/git-commit.txt:37 #, priority:280 msgid "by using linkgit:git-rm[1] to remove files from the working tree and the index, again before using the 'commit' command;" -msgstr "�싪퓝鵝욜뵪 linkgit:git-rm[1] 餓롥램鵝쒏젒�뚨뇨凉뺜릎�좈솮�뉏뻑竊뚦릪�룟쑉鵝욜뵪 \"�먧벡 \"�썰빱阿뗥뎺��" +msgstr "�싪퓝鵝욜뵪 linkgit:git-rm[1] 餓롥램鵝쒏젒�뚨뇨凉뺜릎�좈솮�뉏뻑竊뚦냽轝▽슴�ⓥ�쒏룓雅ㅲ�앭뫝餓ㅴ퉳�랃폑" #. type: Plain text #: en/git-commit.txt:43 #, priority:280 msgid "by listing files as arguments to the 'commit' command (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git);" -msgstr "�②퓳燁띷깄�듕툔竊뚧룓雅ㅴ폏恙썹븼榮℡폊訝�쉪�섇뙑竊뚩�뚧삸溫겼퐬���쀦뻼餓띄쉪壤볟뎺�끻�竊덅퓳雅쎿뻼餓뜹퓚窈삣럴瀯뤶맏 Git ���ο펹��" +msgstr "�싪퓝弱녷뻼餓뜹닓訝뷜�쐁ommit�앭뫝餓ㅷ쉪�귝빊(訝띶를--interactive��--patch switch)竊뚦쑉瓦숂쭕�끻넻訝뗰펽�먧벡弱녶옙�η뇨凉뺜릎�꾣쎍�뱄펽�뚧삸溫겼퐬���쀦뻼餓띄쉪壤볟뎺�끻�(Git恙낂』藥꿰퍘�ι걪);" #. type: Plain text #: en/git-commit.txt:49 @@ -15952,9 +15940,9 @@ msgstr "--no-post-rewrite" #. type: Plain text #: en/git-commit.txt:299 -#, fuzzy, priority:280 +#, priority:280 msgid "Bypass the post-rewrite hook." -msgstr " post-rewrite " +msgstr "瀯뺠퓝post-rewrite�⒴춴" #. type: Labeled list #: en/git-commit.txt:301 @@ -19323,9 +19311,9 @@ msgstr "git-daemon(1)" #. type: Plain text #: en/git-daemon.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-daemon - A really simple server for Git repositories" -msgstr " Git " +msgstr "git-daemon - 訝�訝ら씆躍며��뺟쉪git耶섇궓佯볠쐨�▼솳��" #. type: Plain text #: en/git-daemon.txt:25 @@ -19984,10 +19972,9 @@ msgstr "訝롥끀野삥돻�먧벡�띸쉪�뉒�竊뚥툖倻귛��얏룓雅ㅵ릮�꾣젃嶺억펽餓롨�� #. type: Plain text #: en/git-describe.txt:71 -#, fuzzy, priority:260 -#| msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag." +#, priority:260 msgid "Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag." -msgstr "訝띹쫨鵝욜뵪容섋���7鵝띶뛻��퓵�뜻빊耶쀤퐳訝뷴�穩▼릫燁곁쉪煐⒴넍竊뚩�뚧삸鵝욜뵪<n>鵝랃펽�뽬�끾졊���誤곦슴�ⓨ쩀弱묇퐤�ε숱�먧�訝ょ떖�밭쉪野배괌�띸㎞�� <n>訝�0弱녷뒔�띌빣�쇔폀竊뚦룵�양ㅊ���θ퓩�꾣젃嶺얇��" +msgstr "訝띹쫨鵝욜뵪煐⒴넍野배괌�띸㎞�꾦퍡溫ㅵ뛻��퓵�뜻빊耶쀯펷�방뜮耶섇궓佯볞릎野배괌�꾣빊�뤺�뚦룜�뽳펽容섋�訝�7竊됵펽�뚧삸鵝욜뵪<n>�겼춻竊뚧닑�방뜮��誤곦슴�ⓧ뻣�뤷쩀�꾣빊耶쀦씎壤€닇����꾢�穩▼릫燁겹��<n>訝�0弱녷뒔�띌빣�쇔폀竊뚥퍎�양ㅊ��瓦묊쉪�뉓���" #. type: Labeled list #: en/git-describe.txt:72 @@ -20033,9 +20020,9 @@ msgstr "�삥삸渦볟눣�욘졏凉륅펷�뉒��곫룓雅ㅶ빊�뤷뭽�먧벡�띸㎞�꾤섄�숋펹 #. type: Labeled list #: en/git-describe.txt:97 -#, fuzzy, no-wrap, priority:260 +#, no-wrap, priority:260 msgid "--match <pattern>" -msgstr " <>" +msgstr "--match <pattern>" #. type: Plain text #: en/git-describe.txt:106 @@ -20588,9 +20575,9 @@ msgstr "--tool-help" #. type: Plain text #: en/git-difftool.txt:79 -#, fuzzy, priority:100 +#, priority:100 msgid "Print a list of diff tools that may be used with `--tool`." -msgstr " `--tool` " +msgstr "�쀥눣��빳��\"--tool\"�썰빱訝�壅룝슴�①쉪diff藥ε끁��" #. type: Labeled list #: en/git-difftool.txt:80 @@ -26218,9 +26205,9 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:267 -#, fuzzy, priority:100 +#, priority:100 msgid "The optional GPG signature of the tag." -msgstr " GPG " +msgstr "tag�꾢룾�덲PG嶺얍릫��" #. type: Labeled list #: en/git-for-each-ref.txt:268 @@ -26638,9 +26625,9 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:128 -#, fuzzy, priority:100 +#, priority:100 msgid "Start numbering the patches at <n> instead of 1." -msgstr " <n> 1" +msgstr "餓�<n>凉�冶뗤릉瀯숃‥訝곭폋�뤄펽�요빰容섋�餓�1凉�冶뗣��" #. type: Labeled list #: en/git-format-patch.txt:129 @@ -28608,9 +28595,9 @@ msgstr "" #. type: Plain text #: en/git-grep.txt:181 -#, fuzzy, priority:100 +#, priority:100 msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])." -msgstr "倻귝옖亦→쐣 `-z` �됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙�졽툓凉뺝뤇竊뚧�倻귡뀓營�룜�� \"core.quotePath\" ��鰲i뇢�꾦궍�뤄펷�귟쭅 linkgit:git-config[1]竊됥�� 鵝욜뵪 `-z` �됮」竊뚧뻼餓뜹릫弱녻˙�먨춻渦볟눣竊뚦뭉餓� NUL 耶쀨뒄瀯볠씇��" +msgstr "鵝욜뵪\\0鵝쒍맏渦볟눣訝�러孃꾢릫�꾢늽�붺Е竊뚦뭉�먨춻�볟뜲若껂뺄�귝뙃�㏝뀓營�룜�뢢ore.quotePath�꾥��롳펽凉뺟뵪躍�쐣�� unusual�앭춻寧�쉪瓮�푶�� (�ι쁾linkgit:git-config[1])��" #. type: Labeled list #: en/git-grep.txt:183 @@ -29034,9 +29021,9 @@ msgstr "git-gui(1)" #. type: Plain text #: en/git-gui.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-gui - A portable graphical interface to Git" -msgstr " Git " +msgstr "git-gui - 訝�訝ゅ룾燁삥쨳�꼏it�얍숱�뚪씊" #. type: Plain text #: en/git-gui.txt:12 @@ -29256,9 +29243,9 @@ msgstr "git-hash-object(1)" #. type: Plain text #: en/git-hash-object.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-hash-object - Compute object ID and optionally creates a blob from a file" -msgstr " ID blob " +msgstr "git-hash-object - 溫←츞野배괌ID竊뚦뭉���됪떓餓롦뻼餓뜹닗兩튯lob��" #. type: Plain text #: en/git-hash-object.txt:14 @@ -29348,9 +29335,9 @@ msgstr "git-help(1)" #. type: Plain text #: en/git-help.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-help - Display help information about Git" -msgstr " Git " +msgstr "git-help - �양ㅊ�됧뀽git�꾢리�⒳에��" #. type: Plain text #: en/git-help.txt:15 @@ -30190,9 +30177,9 @@ msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--s #. type: Plain text #: en/git-http-fetch.txt:17 -#, fuzzy, priority:100 +#, priority:100 msgid "Downloads a remote Git repository via HTTP." -msgstr " HTTP Git " +msgstr "�싪퓝HTTP訝뗨슬瓦쒐쮮Git耶섇궓佯볝��" #. type: Plain text #: en/git-http-fetch.txt:21 @@ -30298,9 +30285,9 @@ msgstr "git-http-push(1)" #. type: Plain text #: en/git-http-push.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-http-push - Push objects over HTTP/DAV to another repository" -msgstr " HTTP/DAV " +msgstr "git-http-push - �싪퓝http/DAV弱녶�穩→렓�곩댆�╊�訝ゅ춼�ⓨ틩" #. type: Plain text #: en/git-http-push.txt:13 @@ -34477,9 +34464,9 @@ msgstr "" #. type: Plain text #: en/git-mergetool.txt:69 -#, fuzzy, priority:240 +#, priority:240 msgid "Print a list of merge tools that may be used with `--tool`." -msgstr " `--tool` " +msgstr "�볟뜲�뷴룾餓ε뭽\"--tool\"�썰빱訝�壅룝슴�①쉪merge藥ε끁�쀨〃��" #. type: Plain text #: en/git-mergetool.txt:77 @@ -38668,9 +38655,9 @@ msgstr "" #. type: Plain text #: en/git-pull.txt:120 -#, fuzzy, priority:220 +#, priority:220 msgid "When false, merge the upstream branch into the current branch." -msgstr " quilt " +msgstr "倻귝옖訝튴alse竊뚦닕弱녵툓歷멨늽��릦亮뜹댆壤볟뎺�녷뵱訝���" #. type: Plain text #: en/git-pull.txt:122 @@ -45140,9 +45127,9 @@ msgstr "git-reset(1)" #. type: Plain text #: en/git-reset.txt:7 -#, fuzzy, priority:280 +#, priority:280 msgid "git-reset - Reset current HEAD to the specified state" -msgstr " HEAD " +msgstr "git-reset - �띸쉰壤볟뎺HEAD�경뙁若싩쉪�뜻��" #. type: Plain text #: en/git-reset.txt:15 @@ -48330,9 +48317,9 @@ msgstr "--[no-]signed-off-by-cc" #. type: Plain text #: en/git-send-email.txt:330 -#, fuzzy, priority:100 +#, priority:100 msgid "If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc." -msgstr "If disabled with \"--no-thread\", those headers will not be added (unless specified with --in-reply-to). Default is the value of the `sendemail.thread` configuration value; if that is unspecified, default to --thread." +msgstr "倻귝옖溫양쉰雅녷��됮」竊뚩�弱녳�� Signed-off-by�앶쥋�딀닑�꾦�곻폏烏뚥릎�꾤뵷耶먬궙餓뜻렌�졾댆�꾦�곩닓烏ⓧ릎�귡퍡溫ㅴ맏`sendmail.signedoffbycc`�띸쉰�쇘쉪�쇽폑倻귝옖�ゆ뙁若싷펽�숅퍡溫ㅴ맏--signed-off-by-cc��" #. type: Labeled list #: en/git-send-email.txt:331 @@ -51334,7 +51321,7 @@ msgstr "" #: en/git-status.txt:257 #, priority:280 msgid "'m' and '?' are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as '?' as well." -msgstr "'m'��'?'���믣퐩佯붺뵪�꾠�귚풃倻귨펽倻귝옖訝�訝ゅ춴與▼쓼訝�쉪葯뚦쪞耶먩Æ�쀥똿�ヤ�訝ゆ쑋瓮잒릉�꾣뻼餓띰펽瓦쇾튋鴉싨뒫�듾맏'?" +msgstr "'m'��'?'���믣퐩佯붺뵪�꾠�귚풃倻귨펽倻귝옖訝�訝ゅ춴與▼쓼訝�쉪葯뚦쪞耶먩Æ�쀥똿�ヤ�訝ゆ쑋瓮잒릉�꾣뻼餓띰펽瓦쇾튋鴉싨뒫�듾맏'?'" #. type: Plain text #: en/git-status.txt:259 @@ -54854,9 +54841,9 @@ msgstr "git-tag(1)" #. type: Plain text #: en/git-tag.txt:7 -#, fuzzy, priority:240 +#, priority:240 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG" -msgstr " GPG " +msgstr "git-tag - �쎾뻠�곩닓�뷩�곩닠�ㅶ닑謠뚩칮鵝욜뵪GPG嶺얍릫�꼝ag野배괌" #. type: Plain text #: en/git-tag.txt:20 @@ -58612,9 +58599,9 @@ msgstr "--[no-]strict" #. type: Plain text #: en/git-upload-pack.txt:30 -#, fuzzy, priority:100 +#, priority:100 msgid "Do not try <directory>/.git/ if <directory> is no Git directory." -msgstr " <> Git <>/.git/" +msgstr "倻귝옖<directory>訝띷삸git��퐬竊뚩�訝띹쫨弱앲캊<directory>/.git/��" #. type: Plain text #: en/git-upload-pack.txt:33 @@ -59909,16 +59896,13 @@ msgstr "倻귝옖亦→쐣瓦쇾릉�됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙凉� #. type: delimited block - #: en/git-worktree.txt:462 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git worktree list --porcelain\n" "...\n" "locked \"reason\\nwhy is locked\"\n" "...\n" -msgstr "" -"$ git worktree list --porcelain\n" -"worktree /path/to/bare-source\n" -"bare\n" +msgstr "$ git worktree list --porcelain\n��\nlocked \"reason\\nwhy is locked\"\n��\n" #. type: Plain text #: en/git-worktree.txt:474 @@ -66719,13 +66703,11 @@ msgstr "倻귝옖耶섇쑉鸚㏝뇧映삡세�띸㎞�꾥퓶葉뗥춼�ⓨ틩竊뚦뭉訝붹궓誤곦맏�뜸슴 #. type: delimited block - #: en/urls.txt:78 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "" "\t[url \"<actual url base>\"]\n" "\t\tinsteadOf = <other url base>\n" -msgstr "" -"\t[url \"<actual url base>\"]\n" -"\t\tinsteadOf = <other url base>\n" +msgstr "\t[url \"<actual url base>\"]\n\t\tinsteadOf = <other url base>\n" #. type: Plain text #: en/urls.txt:81 en/urls.txt:100 @@ -66759,13 +66741,11 @@ msgstr "倻귝옖誤곲뇥�쇾퍎�ⓧ틢�③�곭쉪 URL竊뚦룾餓ε닗兩븃〃�뺟쉪�띸쉰�� #. type: delimited block - #: en/urls.txt:97 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "" "\t[url \"<actual url base>\"]\n" "\t\tpushInsteadOf = <other url base>\n" -msgstr "" -"\t[url \"<actual url base>\"]\n" -"\t\tpushInsteadOf = <other url base>\n" +msgstr "\t[url \"<actual url base>\"]\n\t\tpushInsteadOf = <other url base>\n" #. type: delimited block - #: en/urls.txt:104